Prechádzať zdrojové kódy

Unnecessary fields fixes

szollosil 1 rok pred
rodič
commit
21288e5f44

+ 1 - 5
custom/eventwizard/class/eventproduct.class.php

@@ -116,8 +116,7 @@ class EventProduct extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0, 'default'=>'1', 'index'=>1,),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
-		'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Fixed amount", 'validate'=>'1',),
-		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Maximum quantity (0 means no limit)", 'validate'=>'1',),
+		'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'0', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Fixed amount", 'validate'=>'1',),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
@@ -131,14 +130,12 @@ class EventProduct extends CommonObject
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Piszkozat', '1'=>'Hitelesítve', '9'=>'Cancelled'), 'validate'=>'1',),
 		'fk_eventdetails' => array('type'=>'integer:EventDetails:custom/eventwizard/class/eventdetails.class.php', 'label'=>'Event Details', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
-		'type' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1, 'arrayofkeyval'=>array('1'=>'Kötelező elem', '2'=>'Választandó elem', '3'=>'Opcionális'),),
 	);
 	public $rowid;
 	public $entity;
 	public $ref;
 	public $label;
 	public $amount;
-	public $qty;
 	public $description;
 	public $note_public;
 	public $note_private;
@@ -152,7 +149,6 @@ class EventProduct extends CommonObject
 	public $status;
 	public $fk_eventdetails;
 	public $fk_product;
-	public $type;
 	// END MODULEBUILDER PROPERTIES
 
 

+ 1 - 5
custom/eventwizard/class/eventproduct.class.php.back

@@ -117,7 +117,7 @@ class EventProduct extends CommonObject
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
 		'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Fixed amount", 'validate'=>'1',),
-		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Maximum quantity (0 means no limit)", 'validate'=>'1',),
+		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'0', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Maximum quantity (0 means no limit)", 'validate'=>'1',),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
@@ -131,8 +131,6 @@ class EventProduct extends CommonObject
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Piszkozat', '1'=>'Hitelesítve', '9'=>'Cancelled'), 'validate'=>'1',),
 		'fk_eventdetails' => array('type'=>'integer:EventDetails:custom/eventwizard/class/eventdetails.class.php', 'label'=>'Event Details', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
-		'fk_eventoption' => array('type'=>'integer:EventOption:custom/eventwizard/class/eventoption.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'Event Option', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
-		'type' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1, 'arrayofkeyval'=>array('1'=>'Kötelező elem', '2'=>'Választandó elem', '3'=>'Opcionális'),),
 	);
 	public $rowid;
 	public $entity;
@@ -153,8 +151,6 @@ class EventProduct extends CommonObject
 	public $status;
 	public $fk_eventdetails;
 	public $fk_product;
-	public $fk_eventoption;
-	public $type;
 	// END MODULEBUILDER PROPERTIES
 
 

+ 6 - 6
custom/eventwizard/core/modules/modEventWizard.class.php

@@ -374,7 +374,7 @@ class modEventWizard extends DolibarrModules
             'fk_menu'=>'fk_mainmenu=eventwizard',
             // This is a Left menu entry
             'type'=>'left',
-            'titre'=>'List EventDetails',
+            'titre'=>'ListEventDetails',
             'mainmenu'=>'eventwizard',
             'leftmenu'=>'eventwizard_eventdetails',
             'url'=>'/eventwizard/eventdetails_list.php',
@@ -394,7 +394,7 @@ class modEventWizard extends DolibarrModules
             'fk_menu'=>'fk_mainmenu=eventwizard,fk_leftmenu=eventwizard_eventdetails',
             // This is a Left menu entry
             'type'=>'left',
-            'titre'=>'New EventDetails',
+            'titre'=>'NewEventDetails',
             'mainmenu'=>'eventwizard',
             'leftmenu'=>'eventwizard_eventdetails',
             'url'=>'/eventwizard/eventdetails_card.php?action=create',
@@ -412,7 +412,7 @@ class modEventWizard extends DolibarrModules
 		$this->menu[$r++]=array(
             'fk_menu'=>'fk_mainmenu=eventwizard',
             'type'=>'left',
-            'titre'=>'List EventLocation',
+            'titre'=>'ListEventLocation',
             'mainmenu'=>'eventwizard',
             'leftmenu'=>'eventwizard_eventlocation',
             'url'=>'/eventwizard/eventlocation_list.php',
@@ -426,7 +426,7 @@ class modEventWizard extends DolibarrModules
 		$this->menu[$r++]=array(
             'fk_menu'=>'fk_mainmenu=eventwizard',
             'type'=>'left',
-            'titre'=>'List EventProduct',
+            'titre'=>'ListEventProduct',
             'mainmenu'=>'eventwizard',
             'leftmenu'=>'eventwizard_eventproduct',
             'url'=>'/eventwizard/eventproduct_list.php',
@@ -437,7 +437,7 @@ class modEventWizard extends DolibarrModules
             'target'=>'',
             'user'=>2,
         );
-		$this->menu[$r++]=array(
+		/* $this->menu[$r++]=array(
             'fk_menu'=>'fk_mainmenu=eventwizard',
             'type'=>'left',
             'titre'=>'List EventOption (-?-)',
@@ -450,7 +450,7 @@ class modEventWizard extends DolibarrModules
             'perms'=>'1',
             'target'=>'',
             'user'=>2,
-        );
+        ); */
 		
 		/* END MODULEBUILDER LEFTMENU EVENTDETAILS */
 		// Exports profiles provided by this module

+ 1 - 1
custom/eventwizard/eventdetails_list.php

@@ -260,7 +260,7 @@ $now = dol_now();
 
 //$help_url = "EN:Module_EventDetails|FR:Module_EventDetails_FR|ES:Módulo_EventDetails";
 $help_url = '';
-$title = $langs->trans("EventDetailss");
+$title = $langs->trans("EventDetails");
 $morejs = array();
 $morecss = array();
 

+ 8 - 0
custom/eventwizard/langs/en_US/eventwizard.lang

@@ -52,3 +52,11 @@ MyPageName = My page name
 #
 MyWidget = My widget
 MyWidgetDescription = My widget description
+
+EventDetails = Event details
+EventLocation = Event location
+EventProduct = Event Product
+ListEventProduct = List of event products
+ListEventLocation = List of event locations
+NewEventDetails = New Event detail
+ListEventDetails = List of event details

+ 8 - 0
custom/eventwizard/langs/hu_HU/eventwizard.lang

@@ -52,3 +52,11 @@ MyPageName = My page name
 #
 MyWidget = My widget
 MyWidgetDescription = My widget description
+
+EventDetails = Események
+EventLocation = Eseményhelyszín
+EventProduct = Eseményszolgáltatás
+ListEventProduct = Eseményszolgáltatások listája
+ListEventLocation = Eseményhelyszínek listája
+NewEventDetails = Új esemény
+ListEventDetails = Események listája

+ 1 - 3
custom/eventwizard/sql/llx_eventwizard_eventproduct.sql

@@ -21,7 +21,6 @@ CREATE TABLE llx_eventwizard_eventproduct(
 	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
 	label varchar(255), 
 	amount double DEFAULT NULL, 
-	qty real, 
 	description text, 
 	note_public text, 
 	note_private text, 
@@ -34,7 +33,6 @@ CREATE TABLE llx_eventwizard_eventproduct(
 	model_pdf varchar(255), 
 	status integer NOT NULL, 
 	fk_eventdetails integer, 
-	fk_product integer, 
-	type integer
+	fk_product integer
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;

+ 1 - 3
custom/eventwizard/sql/llx_eventwizard_eventproduct.sql.back

@@ -34,8 +34,6 @@ CREATE TABLE llx_eventwizard_eventproduct(
 	model_pdf varchar(255), 
 	status integer NOT NULL, 
 	fk_eventdetails integer, 
-	fk_product integer, 
-	fk_eventoption integer, 
-	type integer
+	fk_product integer
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;