ATM-Consulting / dolibarr_module_subtotal

lib/subtotal.lib.php

Indentation +23 added lines, -23 removed lines

@@ -25,25 +25,25 @@ 
 
 function subtotalAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("subtotal@subtotal");
+	$langs->load("subtotal@subtotal");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_setup.php", 1);
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'settings';
-    $h++;
-    $head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+	$head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_setup.php", 1);
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
 
-    return $head;
+	return $head;
 }
 
 function getHtmlSelectTitle(&$object, $showLabel=false)
@@ -239,17 +239,17 @@ 
 			$classname = ucfirst($element);
 			
 			switch ($element) {
-			    case 'supplier_proposal':
-			        $classname = 'SupplierProposal';
-			        break;
+				case 'supplier_proposal':
+					$classname = 'SupplierProposal';
+					break;
 			        
-			    case 'order_supplier':
-			        $classname = 'CommandeFournisseur';
-			        break;
+				case 'order_supplier':
+					$classname = 'CommandeFournisseur';
+					break;
 			        
-			    case 'invoice_supplier':
-			        $classname = 'FactureFournisseur';
-			        break;
+				case 'invoice_supplier':
+					$classname = 'FactureFournisseur';
+					break;
 			}
 			
 			$object = new $classname($db); // Propal | Commande | Facture

core/modules/modSubtotal.class.php

Indentation +380 added lines, -380 removed lines

@@ -31,170 +31,170 @@ 
 class modSubtotal extends DolibarrModules
 {
 
-    /**
-     * 	Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * 	@param	DoliDB		$db	Database handler
-     */
+	/**
+	 * 	Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * 	@param	DoliDB		$db	Database handler
+	 */
      
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		$this->editor_name = 'ATM-Consulting';
-        // Id for module (must be unique).
-        // Use a free id here
-        // (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 104777; // 104000 to 104999 for ATM CONSULTING
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'subtotal';
+		// Id for module (must be unique).
+		// Use a free id here
+		// (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 104777; // 104000 to 104999 for ATM CONSULTING
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'subtotal';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "technic";
-        // Module label (no space allowed)
-        // used if translation string 'ModuleXXXName' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description
-        // used if translation string 'ModuleXXXDesc' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module permettant l'ajout de sous-totaux et sous-totaux intermédiaires et le déplacement d'une ligne aisée de l'un dans l'autre";
-        // Possible values for version are: 'development', 'experimental' or version
-        $this->version = '3.0.1';
-        // Key used in llx_const table to save module status enabled/disabled
-        // (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-        // Where to store the module in setup page
-        // (0=common,1=interface,2=others,3=very specific)
-        $this->special = 2;
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png
-        // use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png
-        // use this->picto='pictovalue@module'
-        $this->picto = 'subtotal@subtotal'; // mypicto@titre
-        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /titre/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /titre/core/modules/barcode)
-        // for specific css file (eg: /titre/css/titre.css.php)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory
-            'triggers' => 1,
-            // Set this to 1 if module has its own login method directory
-            //'login' => 0,
-            // Set this to 1 if module has its own substitution function file
-            //'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory
-            //'menus' => 0,
-            // Set this to 1 if module has its own barcode directory
-            //'barcode' => 0,
-            // Set this to 1 if module has its own models directory
-            'models' => 1,
-            // Set this to relative path of css if module has its own css file
-            //'css' => '/titre/css/mycss.css.php',
-            // Set here all hooks context managed by module
-            'hooks' => array('invoicecard', 'invoicesuppliercard','propalcard', 'supplier_proposalcard', 'ordercard', 'ordersuppliercard','odtgeneration','orderstoinvoice','admin','invoicereccard')
-            // Set here all workflow context managed by module
-            //'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
-        );
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "technic";
+		// Module label (no space allowed)
+		// used if translation string 'ModuleXXXName' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description
+		// used if translation string 'ModuleXXXDesc' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module permettant l'ajout de sous-totaux et sous-totaux intermédiaires et le déplacement d'une ligne aisée de l'un dans l'autre";
+		// Possible values for version are: 'development', 'experimental' or version
+		$this->version = '3.0.1';
+		// Key used in llx_const table to save module status enabled/disabled
+		// (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		// Where to store the module in setup page
+		// (0=common,1=interface,2=others,3=very specific)
+		$this->special = 2;
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png
+		// use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png
+		// use this->picto='pictovalue@module'
+		$this->picto = 'subtotal@subtotal'; // mypicto@titre
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /titre/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /titre/core/modules/barcode)
+		// for specific css file (eg: /titre/css/titre.css.php)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory
+			'triggers' => 1,
+			// Set this to 1 if module has its own login method directory
+			//'login' => 0,
+			// Set this to 1 if module has its own substitution function file
+			//'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory
+			//'menus' => 0,
+			// Set this to 1 if module has its own barcode directory
+			//'barcode' => 0,
+			// Set this to 1 if module has its own models directory
+			'models' => 1,
+			// Set this to relative path of css if module has its own css file
+			//'css' => '/titre/css/mycss.css.php',
+			// Set here all hooks context managed by module
+			'hooks' => array('invoicecard', 'invoicesuppliercard','propalcard', 'supplier_proposalcard', 'ordercard', 'ordersuppliercard','odtgeneration','orderstoinvoice','admin','invoicereccard')
+			// Set here all workflow context managed by module
+			//'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
+		);
 
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/titre/temp");
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/titre/temp");
+		$this->dirs = array();
 
-        // Config pages. Put here list of php pages
-        // stored into titre/admin directory, used to setup module.
-        $this->config_page_url = array("subtotal_setup.php@subtotal");
+		// Config pages. Put here list of php pages
+		// stored into titre/admin directory, used to setup module.
+		$this->config_page_url = array("subtotal_setup.php@subtotal");
 
-        // Dependencies
-        // List of modules id that must be enabled if this module is enabled
-        $this->depends = array();
+		// Dependencies
+		// List of modules id that must be enabled if this module is enabled
+		$this->depends = array();
 
 		$this->conflictwith=array('modMilestone');
-        // List of modules id to disable if this one is disabled
-        $this->requiredby = array();
-        // Minimum version of PHP required by module
-        $this->phpmin = array(5, 3);
-        // Minimum version of Dolibarr required by module
-        $this->need_dolibarr_version = array(3, 2);
-        $this->langfiles = array("subtotal@subtotal"); // langfiles@titre
-        // Constants
-        // List of particular constants to add when module is enabled
-        // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example:
-        $this->const = array(
-            	0=>array(
-            		'SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES',
-            		'chaine',
-            		'I',
-            		'Définit le style (B : gras, I : Italique, U : Souligné) des sous titres lorsque le détail des lignes et des ensembles est caché',
-            		1
-            	)
+		// List of modules id to disable if this one is disabled
+		$this->requiredby = array();
+		// Minimum version of PHP required by module
+		$this->phpmin = array(5, 3);
+		// Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(3, 2);
+		$this->langfiles = array("subtotal@subtotal"); // langfiles@titre
+		// Constants
+		// List of particular constants to add when module is enabled
+		// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example:
+		$this->const = array(
+				0=>array(
+					'SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES',
+					'chaine',
+					'I',
+					'Définit le style (B : gras, I : Italique, U : Souligné) des sous titres lorsque le détail des lignes et des ensembles est caché',
+					1
+				)
 				,1=>array('SUBTOTAL_ALLOW_ADD_BLOCK', 'chaine', '1', 'Permet l\'ajout de titres et sous-totaux')
 				,2=>array('SUBTOTAL_ALLOW_EDIT_BLOCK', 'chaine', '1', 'Permet de modifier titres et sous-totaux')
 				,3=>array('SUBTOTAL_ALLOW_REMOVE_BLOCK', 'chaine', '1', 'Permet de supprimer les titres et sous-totaux')
 				,4=>array('SUBTOTAL_TITLE_STYLE', 'chaine', 'BU')
 				,5=>array('SUBTOTAL_SUBTOTAL_STYLE', 'chaine', 'B')
-            //	1=>array(
-            //		'MYMODULE_MYNEWCONST2',
-            //		'chaine',
-            //		'myvalue',
-            //		'This is another constant to add',
-            //		0
-            //	)
-        );
+			//	1=>array(
+			//		'MYMODULE_MYNEWCONST2',
+			//		'chaine',
+			//		'myvalue',
+			//		'This is another constant to add',
+			//		0
+			//	)
+		);
 		
 
 
 
-        // Array to add new pages in new tabs
-        // Example:
-        $this->tabs = array(
-            //	// To add a new tab identified by code tabname1
-            //	'objecttype:+tabname1:Title1:langfile@titre:$user->rights->titre->read:/titre/mynewtab1.php?id=__ID__',
-            //	// To add another new tab identified by code tabname2
-            //	'objecttype:+tabname2:Title2:langfile@titre:$user->rights->othermodule->read:/titre/mynewtab2.php?id=__ID__',
-            //	// To remove an existing tab identified by code tabname
-            //	'objecttype:-tabname'
-        );
-        // where objecttype can be
-        // 'thirdparty'			to add a tab in third party view
-        // 'intervention'		to add a tab in intervention view
-        // 'order_supplier'		to add a tab in supplier order view
-        // 'invoice_supplier'	to add a tab in supplier invoice view
-        // 'invoice'			to add a tab in customer invoice view
-        // 'order'				to add a tab in customer order view
-        // 'product'			to add a tab in product view
-        // 'stock'				to add a tab in stock view
-        // 'propal'				to add a tab in propal view
-        // 'member'				to add a tab in fundation member view
-        // 'contract'			to add a tab in contract view
-        // 'user'				to add a tab in user view
-        // 'group'				to add a tab in group view
-        // 'contact'			to add a tab in contact view
-        // 'categories_x'		to add a tab in category view
-        // (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // Dictionnaries
-        if (! isset($conf->subtotal->enabled)) {
-            $conf->subtotal=new stdClass();
-            $conf->subtotal->enabled = 0;
-        }
-        $this->dictionaries = array(
+		// Array to add new pages in new tabs
+		// Example:
+		$this->tabs = array(
+			//	// To add a new tab identified by code tabname1
+			//	'objecttype:+tabname1:Title1:langfile@titre:$user->rights->titre->read:/titre/mynewtab1.php?id=__ID__',
+			//	// To add another new tab identified by code tabname2
+			//	'objecttype:+tabname2:Title2:langfile@titre:$user->rights->othermodule->read:/titre/mynewtab2.php?id=__ID__',
+			//	// To remove an existing tab identified by code tabname
+			//	'objecttype:-tabname'
+		);
+		// where objecttype can be
+		// 'thirdparty'			to add a tab in third party view
+		// 'intervention'		to add a tab in intervention view
+		// 'order_supplier'		to add a tab in supplier order view
+		// 'invoice_supplier'	to add a tab in supplier invoice view
+		// 'invoice'			to add a tab in customer invoice view
+		// 'order'				to add a tab in customer order view
+		// 'product'			to add a tab in product view
+		// 'stock'				to add a tab in stock view
+		// 'propal'				to add a tab in propal view
+		// 'member'				to add a tab in fundation member view
+		// 'contract'			to add a tab in contract view
+		// 'user'				to add a tab in user view
+		// 'group'				to add a tab in group view
+		// 'contact'			to add a tab in contact view
+		// 'categories_x'		to add a tab in category view
+		// (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// Dictionnaries
+		if (! isset($conf->subtotal->enabled)) {
+			$conf->subtotal=new stdClass();
+			$conf->subtotal->enabled = 0;
+		}
+		$this->dictionaries = array(
 			'langs'=>'subtotal@subtotal',
-            'tabname'=>array(MAIN_DB_PREFIX.'c_subtotal_free_text'),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array($langs->trans('subtotalFreeLineDictionary')),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.label, f.content, f.entity, f.active FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text as f WHERE f.entity='.$conf->entity),	// Request to select fields
-            'tabsqlsort'=>array('label ASC'),																					// Sort order
-            'tabfield'=>array('label,content'),							// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array('label,content'),						// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array('label,content,entity'),					// List of fields (list of fields for insert)
-            'tabrowid'=>array('rowid'),											// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->subtotal->enabled)	
+			'tabname'=>array(MAIN_DB_PREFIX.'c_subtotal_free_text'),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array($langs->trans('subtotalFreeLineDictionary')),													// Label of tables
+			'tabsql'=>array('SELECT f.rowid as rowid, f.label, f.content, f.entity, f.active FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text as f WHERE f.entity='.$conf->entity),	// Request to select fields
+			'tabsqlsort'=>array('label ASC'),																					// Sort order
+			'tabfield'=>array('label,content'),							// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array('label,content'),						// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array('label,content,entity'),					// List of fields (list of fields for insert)
+			'tabrowid'=>array('rowid'),											// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->subtotal->enabled)	
 		);
-        /* Example:
+		/* Example:
           // This is to avoid warnings
           if (! isset($conf->titre->enabled)) $conf->titre->enabled=0;
           $this->dictionnaries=array(
@@ -235,223 +235,223 @@ 
           );
          */
 
-        // Boxes
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // Boxes list
+		// Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		$this->boxes = array(); // Boxes list
        
-        /*
+		/*
           $this->boxes[$r][1] = "myboxb.php";
           $r++;
          */
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
-        // Add here list of permission defined by
-        // an id, a label, a boolean and two constant strings.
-        // Example:
-        //// Permission id (must not be already used)
-        //$this->rights[$r][0] = 2000;
-        //// Permission label
-        //$this->rights[$r][1] = 'Permision label';
-        //// Permission by default for new user (0/1)
-        //$this->rights[$r][3] = 1;
-        //// In php code, permission will be checked by test
-        //// if ($user->rights->permkey->level1->level2)
-        //$this->rights[$r][4] = 'level1';
-        //// In php code, permission will be checked by test
-        //// if ($user->rights->permkey->level1->level2)
-        //$this->rights[$r][5] = 'level2';
-        //$r++;
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Add here list of permission defined by
+		// an id, a label, a boolean and two constant strings.
+		// Example:
+		//// Permission id (must not be already used)
+		//$this->rights[$r][0] = 2000;
+		//// Permission label
+		//$this->rights[$r][1] = 'Permision label';
+		//// Permission by default for new user (0/1)
+		//$this->rights[$r][3] = 1;
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][4] = 'level1';
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][5] = 'level2';
+		//$r++;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // Add here entries to declare new menus
-        //
-        // Example to declare a new Top Menu entry and its Left menu entry:
-        //$this->menu[$r]=array(
-        //	// Put 0 if this is a top menu
-        //	'fk_menu'=>0,
-        //	// This is a Top menu entry
-        //	'type'=>'top',
-        //	'titre'=>'titre top menu',
-        //	'mainmenu'=>'titre',
-        //	'leftmenu'=>'titre',
-        //	'url'=>'/titre/pagetop.php',
-        //	// Lang file to use (without .lang) by module.
-        //	// File must be in langs/code_CODE/ directory.
-        //	'langs'=>'mylangfile',
-        //	'position'=>100,
-        //	// Define condition to show or hide menu entry.
-        //	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
-        //	'enabled'=>'$conf->titre->enabled',
-        //	// Use 'perms'=>'$user->rights->titre->level1->level2'
-        //	// if you want your menu with a permission rules
-        //	'perms'=>'1',
-        //	'target'=>'',
-        //	// 0=Menu for internal users, 1=external users, 2=both
-        //	'user'=>2
-        //);
-        //$r++;
-        //$this->menu[$r]=array(
-        //	// Use r=value where r is index key used for the parent menu entry
-        //	// (higher parent must be a top menu entry)
-        //	'fk_menu'=>'r=0',
-        //	// This is a Left menu entry
-        //	'type'=>'left',
-        //	'titre'=>'titre left menu',
-        //	'mainmenu'=>'titre',
-        //	'leftmenu'=>'titre',
-        //	'url'=>'/titre/pagelevel1.php',
-        //	// Lang file to use (without .lang) by module.
-        //	// File must be in langs/code_CODE/ directory.
-        //	'langs'=>'mylangfile',
-        //	'position'=>100,
-        //	// Define condition to show or hide menu entry.
-        //	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
-        //	'enabled'=>'$conf->titre->enabled',
-        //	// Use 'perms'=>'$user->rights->titre->level1->level2'
-        //	// if you want your menu with a permission rules
-        //	'perms'=>'1',
-        //	'target'=>'',
-        //	// 0=Menu for internal users, 1=external users, 2=both
-        //	'user'=>2
-        //);
-        //$r++;
-        //
-        // Example to declare a Left Menu entry into an existing Top menu entry:
-        //$this->menu[$r]=array(
-        //	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
-        //	'fk_menu'=>'fk_mainmenu=mainmenucode',
-        //	// This is a Left menu entry
-        //	'type'=>'left',
-        //	'titre'=>'titre left menu',
-        //	'mainmenu'=>'mainmenucode',
-        //	'leftmenu'=>'titre',
-        //	'url'=>'/titre/pagelevel2.php',
-        //	// Lang file to use (without .lang) by module.
-        //	// File must be in langs/code_CODE/ directory.
-        //	'langs'=>'mylangfile',
-        //	'position'=>100,
-        //	// Define condition to show or hide menu entry.
-        //	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
-        //	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        //	'enabled'=>'$conf->titre->enabled',
-        //	// Use 'perms'=>'$user->rights->titre->level1->level2'
-        //	// if you want your menu with a permission rules
-        //	'perms'=>'1',
-        //	'target'=>'',
-        //	// 0=Menu for internal users, 1=external users, 2=both
-        //	'user'=>2
-        //);
-        //$r++;
-        // Exports
-        $r = 1;
+		// Add here entries to declare new menus
+		//
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		//$this->menu[$r]=array(
+		//	// Put 0 if this is a top menu
+		//	'fk_menu'=>0,
+		//	// This is a Top menu entry
+		//	'type'=>'top',
+		//	'titre'=>'titre top menu',
+		//	'mainmenu'=>'titre',
+		//	'leftmenu'=>'titre',
+		//	'url'=>'/titre/pagetop.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->titre->enabled',
+		//	// Use 'perms'=>'$user->rights->titre->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$r++;
+		//$this->menu[$r]=array(
+		//	// Use r=value where r is index key used for the parent menu entry
+		//	// (higher parent must be a top menu entry)
+		//	'fk_menu'=>'r=0',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		//	'titre'=>'titre left menu',
+		//	'mainmenu'=>'titre',
+		//	'leftmenu'=>'titre',
+		//	'url'=>'/titre/pagelevel1.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->titre->enabled',
+		//	// Use 'perms'=>'$user->rights->titre->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$r++;
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		//$this->menu[$r]=array(
+		//	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
+		//	'fk_menu'=>'fk_mainmenu=mainmenucode',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		//	'titre'=>'titre left menu',
+		//	'mainmenu'=>'mainmenucode',
+		//	'leftmenu'=>'titre',
+		//	'url'=>'/titre/pagelevel2.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
+		//	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//	'enabled'=>'$conf->titre->enabled',
+		//	// Use 'perms'=>'$user->rights->titre->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$r++;
+		// Exports
+		$r = 1;
 
-        // Example:
-        //$this->export_code[$r]=$this->rights_class.'_'.$r;
-        //// Translation key (used only if key ExportDataset_xxx_z not found)
-        //$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
-        //// Condition to show export in list (ie: '$user->id==3').
-        //// Set to 1 to always show when module is enabled.
-        //$this->export_enabled[$r]='1';
-        //$this->export_permission[$r]=array(array("facture","facture","export"));
-        //$this->export_fields_array[$r]=array(
-        //	's.rowid'=>"IdCompany",
-        //	's.nom'=>'CompanyName',
-        //	's.address'=>'Address',
-        //	's.cp'=>'Zip',
-        //	's.ville'=>'Town',
-        //	's.fk_pays'=>'Country',
-        //	's.tel'=>'Phone',
-        //	's.siren'=>'ProfId1',
-        //	's.siret'=>'ProfId2',
-        //	's.ape'=>'ProfId3',
-        //	's.idprof4'=>'ProfId4',
-        //	's.code_compta'=>'CustomerAccountancyCode',
-        //	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
-        //	'f.rowid'=>"InvoiceId",
-        //	'f.facnumber'=>"InvoiceRef",
-        //	'f.datec'=>"InvoiceDateCreation",
-        //	'f.datef'=>"DateInvoice",
-        //	'f.total'=>"TotalHT",
-        //	'f.total_ttc'=>"TotalTTC",
-        //	'f.tva'=>"TotalVAT",
-        //	'f.paye'=>"InvoicePaid",
-        //	'f.fk_statut'=>'InvoiceStatus',
-        //	'f.note'=>"InvoiceNote",
-        //	'fd.rowid'=>'LineId',
-        //	'fd.description'=>"LineDescription",
-        //	'fd.price'=>"LineUnitPrice",
-        //	'fd.tva_tx'=>"LineVATRate",
-        //	'fd.qty'=>"LineQty",
-        //	'fd.total_ht'=>"LineTotalHT",
-        //	'fd.total_tva'=>"LineTotalTVA",
-        //	'fd.total_ttc'=>"LineTotalTTC",
-        //	'fd.date_start'=>"DateStart",
-        //	'fd.date_end'=>"DateEnd",
-        //	'fd.fk_product'=>'ProductId',
-        //	'p.ref'=>'ProductRef'
-        //);
-        //$this->export_entities_array[$r]=array('s.rowid'=>"company",
-        //	's.nom'=>'company',
-        //	's.address'=>'company',
-        //	's.cp'=>'company',
-        //	's.ville'=>'company',
-        //	's.fk_pays'=>'company',
-        //	's.tel'=>'company',
-        //	's.siren'=>'company',
-        //	's.siret'=>'company',
-        //	's.ape'=>'company',
-        //	's.idprof4'=>'company',
-        //	's.code_compta'=>'company',
-        //	's.code_compta_fournisseur'=>'company',
-        //	'f.rowid'=>"invoice",
-        //	'f.facnumber'=>"invoice",
-        //	'f.datec'=>"invoice",
-        //	'f.datef'=>"invoice",
-        //	'f.total'=>"invoice",
-        //	'f.total_ttc'=>"invoice",
-        //	'f.tva'=>"invoice",
-        //	'f.paye'=>"invoice",
-        //	'f.fk_statut'=>'invoice',
-        //	'f.note'=>"invoice",
-        //	'fd.rowid'=>'invoice_line',
-        //	'fd.description'=>"invoice_line",
-        //	'fd.price'=>"invoice_line",
-        //	'fd.total_ht'=>"invoice_line",
-        //	'fd.total_tva'=>"invoice_line",
-        //	'fd.total_ttc'=>"invoice_line",
-        //	'fd.tva_tx'=>"invoice_line",
-        //	'fd.qty'=>"invoice_line",
-        //	'fd.date_start'=>"invoice_line",
-        //	'fd.date_end'=>"invoice_line",
-        //	'fd.fk_product'=>'product',
-        //	'p.ref'=>'product'
-        //);
-        //$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        //$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
-        //	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
-        //$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
-        //	. 'product as p on (fd.fk_product = p.rowid)';
-        //$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
-        //	. 'AND f.rowid = fd.fk_facture';
-        //$r++;
-    }
+		// Example:
+		//$this->export_code[$r]=$this->rights_class.'_'.$r;
+		//// Translation key (used only if key ExportDataset_xxx_z not found)
+		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
+		//// Condition to show export in list (ie: '$user->id==3').
+		//// Set to 1 to always show when module is enabled.
+		//$this->export_enabled[$r]='1';
+		//$this->export_permission[$r]=array(array("facture","facture","export"));
+		//$this->export_fields_array[$r]=array(
+		//	's.rowid'=>"IdCompany",
+		//	's.nom'=>'CompanyName',
+		//	's.address'=>'Address',
+		//	's.cp'=>'Zip',
+		//	's.ville'=>'Town',
+		//	's.fk_pays'=>'Country',
+		//	's.tel'=>'Phone',
+		//	's.siren'=>'ProfId1',
+		//	's.siret'=>'ProfId2',
+		//	's.ape'=>'ProfId3',
+		//	's.idprof4'=>'ProfId4',
+		//	's.code_compta'=>'CustomerAccountancyCode',
+		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
+		//	'f.rowid'=>"InvoiceId",
+		//	'f.facnumber'=>"InvoiceRef",
+		//	'f.datec'=>"InvoiceDateCreation",
+		//	'f.datef'=>"DateInvoice",
+		//	'f.total'=>"TotalHT",
+		//	'f.total_ttc'=>"TotalTTC",
+		//	'f.tva'=>"TotalVAT",
+		//	'f.paye'=>"InvoicePaid",
+		//	'f.fk_statut'=>'InvoiceStatus',
+		//	'f.note'=>"InvoiceNote",
+		//	'fd.rowid'=>'LineId',
+		//	'fd.description'=>"LineDescription",
+		//	'fd.price'=>"LineUnitPrice",
+		//	'fd.tva_tx'=>"LineVATRate",
+		//	'fd.qty'=>"LineQty",
+		//	'fd.total_ht'=>"LineTotalHT",
+		//	'fd.total_tva'=>"LineTotalTVA",
+		//	'fd.total_ttc'=>"LineTotalTTC",
+		//	'fd.date_start'=>"DateStart",
+		//	'fd.date_end'=>"DateEnd",
+		//	'fd.fk_product'=>'ProductId',
+		//	'p.ref'=>'ProductRef'
+		//);
+		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
+		//	's.nom'=>'company',
+		//	's.address'=>'company',
+		//	's.cp'=>'company',
+		//	's.ville'=>'company',
+		//	's.fk_pays'=>'company',
+		//	's.tel'=>'company',
+		//	's.siren'=>'company',
+		//	's.siret'=>'company',
+		//	's.ape'=>'company',
+		//	's.idprof4'=>'company',
+		//	's.code_compta'=>'company',
+		//	's.code_compta_fournisseur'=>'company',
+		//	'f.rowid'=>"invoice",
+		//	'f.facnumber'=>"invoice",
+		//	'f.datec'=>"invoice",
+		//	'f.datef'=>"invoice",
+		//	'f.total'=>"invoice",
+		//	'f.total_ttc'=>"invoice",
+		//	'f.tva'=>"invoice",
+		//	'f.paye'=>"invoice",
+		//	'f.fk_statut'=>'invoice',
+		//	'f.note'=>"invoice",
+		//	'fd.rowid'=>'invoice_line',
+		//	'fd.description'=>"invoice_line",
+		//	'fd.price'=>"invoice_line",
+		//	'fd.total_ht'=>"invoice_line",
+		//	'fd.total_tva'=>"invoice_line",
+		//	'fd.total_ttc'=>"invoice_line",
+		//	'fd.tva_tx'=>"invoice_line",
+		//	'fd.qty'=>"invoice_line",
+		//	'fd.date_start'=>"invoice_line",
+		//	'fd.date_end'=>"invoice_line",
+		//	'fd.fk_product'=>'product',
+		//	'p.ref'=>'product'
+		//);
+		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
+		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
+		//$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
+		//	. 'product as p on (fd.fk_product = p.rowid)';
+		//$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
+		//	. 'AND f.rowid = fd.fk_facture';
+		//$r++;
+	}
 
-    /**
-     * Function called when module is enabled.
-     * The init function add constants, boxes, permissions and menus
-     * (defined in constructor) into Dolibarr database.
-     * It also creates data directories
-     *
-     * 	@param		string	$options	Options when enabling module ('', 'noboxes')
-     * 	@return		int					1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	/**
+	 * Function called when module is enabled.
+	 * The init function add constants, boxes, permissions and menus
+	 * (defined in constructor) into Dolibarr database.
+	 * It also creates data directories
+	 *
+	 * 	@param		string	$options	Options when enabling module ('', 'noboxes')
+	 * 	@return		int					1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 	  	global $conf;
 		
 		
@@ -459,39 +459,39 @@ 
 			exit("Attention, ce module rentre ne conflit avec le module Jalon/Milestones. Merci de le désactiver auparavant.");
 		}
       */
-	    $sql = array();
+		$sql = array();
 
-        $result = $this->loadTables();
+		$result = $this->loadTables();
 
 		
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     * Function called when module is disabled.
-     * Remove from database constants, boxes and permissions from Dolibarr database.
-     * Data directories are not deleted
-     *
-     * 	@param		string	$options	Options when enabling module ('', 'noboxes')
-     * 	@return		int					1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * 	@param		string	$options	Options when enabling module ('', 'noboxes')
+	 * 	@return		int					1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
 
-        return $this->_remove($sql, $options);
-    }
+		return $this->_remove($sql, $options);
+	}
 
-    /**
-     * Create tables, keys and data required by module
-     * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-     * and create data commands must be stored in directory /titre/sql/
-     * This function is called by this->init
-     *
-     * 	@return		int		<=0 if KO, >0 if OK
-     */
-    private function loadTables()
-    {
-        return $this->_load_tables('/subtotal/sql/');
-    }
+	/**
+	 * Create tables, keys and data required by module
+	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
+	 * and create data commands must be stored in directory /titre/sql/
+	 * This function is called by this->init
+	 *
+	 * 	@return		int		<=0 if KO, >0 if OK
+	 */
+	private function loadTables()
+	{
+		return $this->_load_tables('/subtotal/sql/');
+	}
 }

class/subtotal.class.php

Indentation +47 added lines, -47 removed lines

@@ -39,9 +39,9 @@ 
 			 * @var $object Facture fournisseur
 			 */
 			else if($object->element=='invoice_supplier') {
-			    $object->special_code = TSubtotal::$module_number;
-			    $rang = $object->line_max() + 1;
-			    $res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
+				$object->special_code = TSubtotal::$module_number;
+				$rang = $object->line_max() + 1;
+				$res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
 			}
 			/**
 			 * @var $object Propal
@@ -60,8 +60,8 @@ 
 			 * @var $object Commande fournisseur
 			 */
 			else if($object->element=='order_supplier') {
-			    $object->special_code = TSubtotal::$module_number;
-			    $res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
+				$object->special_code = TSubtotal::$module_number;
+				$res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
 			}
 			/**
 			 * @var $object Facturerec
@@ -403,16 +403,16 @@ 
 		$createRight = $user->rights->{$object->element}->creer;
 		if($object->element == 'facturerec' )
 		{
-		    $object->statut = 0; // hack for facture rec
-		    $createRight = $user->rights->facture->creer;
+			$object->statut = 0; // hack for facture rec
+			$createRight = $user->rights->facture->creer;
 		}
 		elseif($object->element == 'order_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->commande->creer;
+			$createRight = $user->rights->fournisseur->commande->creer;
 		}
 		elseif($object->element == 'invoice_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->facture->creer;
+			$createRight = $user->rights->fournisseur->facture->creer;
 		}
 		
 		if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
@@ -437,8 +437,8 @@ 
 							break;
 							
 						case 'supplier_proposal':
-						    $res = $object->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, -1, $line->special_code, 0, 0, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->origin, $line->origin_id);
-						    break;
+							$res = $object->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, -1, $line->special_code, 0, 0, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->origin, $line->origin_id);
+							break;
 							
 						case 'commande':
 							//$desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0)
@@ -446,10 +446,10 @@ 
 							break;
 							
 						case 'order_supplier':
-						    $object->line = $line;
-						    $object->line->fk_commande = $object->id;
-						    $object->line->rang = $object->line_max() +1;
-						    $res = $object->line->insert(1);
+							$object->line = $line;
+							$object->line->fk_commande = $object->id;
+							$object->line->rang = $object->line_max() +1;
+							$res = $object->line->insert(1);
 							break;
 							
 						case 'facture':
@@ -502,8 +502,8 @@ 
 					$object->db->commit();
 					foreach ($TLineAdded as &$line)
 					{
-					    // ça peut paraitre non optimisé de déclancher la fonction sur toutes les lignes mais ceci est nécessaire pour réappliquer l'état exact de chaque ligne
-					    _updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
+						// ça peut paraitre non optimisé de déclancher la fonction sur toutes les lignes mais ceci est nécessaire pour réappliquer l'état exact de chaque ligne
+						_updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
 					}
 					return count($TLineAdded);
 				}
@@ -577,33 +577,33 @@ 
 		
 		switch ($object->element) 
 		{
-		    case 'propal':
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $date_start, $date_end, $array_options, $fk_unit);
-		        break;
+			case 'propal':
+				$res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 		        
-		    case 'supplier_proposal':
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
-		        break;
+			case 'supplier_proposal':
+				$res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
+				break;
 		        
 			case 'commande':
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $special_code, $array_options, $fk_unit);
 				break;
 				
 			case 'order_supplier':
-			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
-			    $res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
-			    break;
+				$object->special_code = SELF::$module_number;
+				if (empty($desc)) $desc = $label;
+				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 			
 			case 'facture':
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $special_code, $array_options, $situation_percent, $fk_unit);
 				break;
 				
 			case 'invoice_supplier':
-			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
-			    $res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
-			    break;
+				$object->special_code = SELF::$module_number;
+				if (empty($desc)) $desc = $label;
+				$res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 				
 			case 'facturerec':
 				// Add extrafields and get rang
@@ -994,8 +994,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -1186,13 +1186,13 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
-    {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-	    $pdf->line($x, $y+$h, $x, $y);
-    }
+	private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+	{
+		if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+		$pdf->line($x+$l, $y, $x+$l, $y+$h);
+		if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+		$pdf->line($x, $y+$h, $x, $y);
+	}
 	
 	
 	public static function concat(&$outputlangs, $files, $fileoutput='')
@@ -1202,14 +1202,14 @@ 
 		if (empty($fileoutput)) $fileoutput = $file[0];
 		
 		$pdf=pdf_getInstance();
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 		
 		foreach($files as $file)

class/actions_subtotal.class.php

Indentation +185 added lines, -185 removed lines

@@ -47,11 +47,11 @@ 
 	 * @return     void
 	 */
     
-    var $module_number = 104777;
+	var $module_number = 104777;
     
-    function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
-    {
-      	global $langs,$db,$user, $conf;
+	function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
+	{
+	  	global $langs,$db,$user, $conf;
 		
 		$langs->load('subtotal@subtotal');
 		
@@ -66,10 +66,10 @@ 
 				$createRight = $user->rights->facture->creer;
 			} elseif($object->element == 'order_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->commande->creer;
+				$createRight = $user->rights->fournisseur->commande->creer;
 			} elseif($object->element == 'invoice_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->facture->creer;
+				$createRight = $user->rights->fournisseur->facture->creer;
 			}
 			
 			if ($object->statut == 0  && $createRight) {
@@ -119,7 +119,7 @@ 
 					
 					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) TSubtotal::addSubtotalMissing($object, $qty);
 					
-	    			TSubtotal::addSubTotalLine($object, $title, $qty);
+					TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
 				else if($action==='ask_deleteallline') {
 						$form=new Form($db);
@@ -341,35 +341,35 @@ 
 		$TContext = explode(':',$parameters['context']);
 		if (
 				in_array('invoicecard',$TContext)
-		        || in_array('invoicesuppliercard',$TContext)
+				|| in_array('invoicesuppliercard',$TContext)
 				|| in_array('propalcard',$TContext)
 				|| in_array('ordercard',$TContext)
-		        || in_array('ordersuppliercard',$TContext)
+				|| in_array('ordersuppliercard',$TContext)
 				|| in_array('invoicereccard',$TContext)
 			)
-	        {	
+			{	
 				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
 				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
 				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : 0;
 				
 				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
 		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 				
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
 		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 		     	
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidePrice').'</label>
 		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
@@ -381,9 +381,9 @@ 
 				if ( 
 					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
 					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-				    || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+					|| (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
 					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-				    || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+					|| (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
 					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
 				)
 				{
@@ -402,19 +402,19 @@ 
 			}
 			
 		
-        return 1;
+		return 1;
 	} 
 	 
-    function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
-    {
+	function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
+	{
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
-        {
+		if (in_array('invoicecard',explode(':',$parameters['context'])))
+		{
         	
-        }
+		}
 		
-        return 0;
-    }
+		return 0;
+	}
 	
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
@@ -463,11 +463,11 @@ 
 	
 		if (
 				in_array('invoicecard',explode(':',$parameters['context']))
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
 				|| in_array('invoicereccard',explode(':',$parameters['context']))
 		) {
 			
@@ -546,20 +546,20 @@ 
 				in_array('invoicecard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-			    || in_array('ordersuppliercard',explode(':',$parameters['context']))
-			    || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-			    || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 			)
-	        {								
+			{								
 				if(in_array('invoicecard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_facture';	
 					$sessname2 = 'subtotal_hidedetails_facture';
 					$sessname3 = 'subtotal_hideprices_facture';
 				}
 				elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_facture_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_facture_fournisseur';
+					$sessname3 = 'subtotal_hideprices_facture_fournisseur';
 				}
 				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
@@ -567,9 +567,9 @@ 
 					$sessname3 = 'subtotal_hideprices_propal';
 				}
 				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
-				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
-				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
+					$sessname = 'subtotal_hideInnerLines_supplier_proposal';
+					$sessname2 = 'subtotal_hidedetails_supplier_proposal';
+					$sessname3 = 'subtotal_hideprices_supplier_proposal';
 				}
 				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
@@ -577,9 +577,9 @@ 
 					$sessname3 = 'subtotal_hideprices_commande';
 				}
 				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_commande_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_commande_fournisseur';
+					$sessname3 = 'subtotal_hideprices_commande_fournisseur';
 				}
 				else {
 					$sessname = 'subtotal_hideInnerLines_unknown';
@@ -601,17 +601,17 @@ 
 				foreach($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 					    
-                        if($line->qty>=90) {
-                            $line->modsubtotal_total = 1;
-                        }
-                        else{
-                            $line->modsubtotal_title = 1;
-                        }
+						if($line->qty>=90) {
+							$line->modsubtotal_total = 1;
+						}
+						else{
+							$line->modsubtotal_title = 1;
+						}
                         
 						$line->total_ht = $this->getTotalLineFromObject($object, $line, '');
 					}
-	        	}
-	        }
+				}
+			}
 			
 		}
 		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
@@ -628,7 +628,7 @@ 
 				 */
 				else if($object->element=='invoice_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Propal
@@ -651,7 +651,7 @@ 
 				 */
 				else if($object->element=='order_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
@@ -695,7 +695,7 @@ 
 		
 		foreach($object->lines as $l) {
 		
-		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
+			$lid = (!empty($l->rowid) ? $l->rowid : $l->id);
 			if($lid == $lineid) {
 
 				$found = true;
@@ -704,7 +704,7 @@ 
 			
 			if($found) {
 				
-			    $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
+				$Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
 				
 				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
 					break; // end of story
@@ -783,17 +783,17 @@ 
 			if($l->rang>=$rang) {
 				return price($total);
 			}
-                        if (TSubtotal::isSubtotal($l)){
-                            $total = 0;
-                        } else  if ($l->situation_percent > 0 ){
+						if (TSubtotal::isSubtotal($l)){
+							$total = 0;
+						} else  if ($l->situation_percent > 0 ){
                            
         	
 		 	$prev_progress = $l->get_prev_progress($object->id);
 		 	$progress = ($l->situation_percent - $prev_progress) /100;
-                        $total += ($l->total_ht/($l->situation_percent/100)) * $progress;
+						$total += ($l->total_ht/($l->situation_percent/100)) * $progress;
                         
-                    }
-                }
+					}
+				}
                 
 		return price($total);
 	}
@@ -825,7 +825,7 @@ 
 		if(method_exists('Closure','bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
 			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+					return $pdf->bMargin ;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
@@ -888,11 +888,11 @@ 
 				else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
-                                        if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
-                                                $total_to_print = $this->getTotalToPrintSituation($object, $line);
-                                        } else {
-                                            	$total_to_print = price($total);
-                                        }
+										if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
+												$total_to_print = $this->getTotalToPrintSituation($object, $line);
+										} else {
+												$total_to_print = price($total);
+										}
                                             
 					$line->total_ht = $total;
 					$line->total = $total;
@@ -1082,19 +1082,19 @@ 
 			}
 		}
 		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    if(is_array($parameters)) $i = & $parameters['i'];
-		    else $i = (int)$parameters;
-		    $this->resprints = price($object->lines[$i]->total_ht);
+			if(is_array($parameters)) $i = & $parameters['i'];
+			else $i = (int)$parameters;
+			$this->resprints = price($object->lines[$i]->total_ht);
 		}
 		if (!empty($hideprices)
-		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
-		    )
+			|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+			)
 		{
-		    if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
-		        return 1;
-		    }
+			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
+				return 1;
+			}
 		}
         
 		return 0;
@@ -1374,11 +1374,11 @@ 
 		$hidedetails = (int)GETPOST('hidedetails');
 		
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
+			$fk_parent_line=0;
 			$TLines =array();
 		
 			$original_count=count($object->lines);
-		    $TTvas = array(); // tableau de tva
+			$TTvas = array(); // tableau de tva
 		    
 			foreach($object->lines as $k=>&$line) 
 			{
@@ -1408,48 +1408,48 @@ 
 			
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
-				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+					if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+					{
+						if($line->tva_tx != '0.000' && $line->product_type!=9){
 				            
-    				        // on remplit le tableau de tva pour substituer les lignes cachées
-    				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
-    				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
-    				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
-    				    }
-    					if($line->product_type==9 && $line->rowid>0)
-    					{
-    					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
-    					    // génère des lignes d'affichage des montants HT soumis à tva
-    					    $nbtva = count($TTvas);
-    					    if(!empty($nbtva)){
-    					        foreach ($TTvas as $tx =>$val){
-    					            $l = clone $line;
-    					            $l->product_type = 1;
-    					            $l->special_code = '';
-    					            $l->qty = 1;
-    					            $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-    					            $l->tva_tx = $tx;
-    					            $l->total_ht = $val['total_ht'];
-    					            $l->total_tva = $val['total_tva'];
-    					            $l->total = $line->total_ht;
-    					            $l->total_ttc = $val['total_ttc'];
-    					            $TLines[] = $l;
-    					            array_shift($TTvas);
-    					       }
-    					    }
+							// on remplit le tableau de tva pour substituer les lignes cachées
+							$TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
+							$TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
+							$TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
+						}
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							//Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
+							// génère des lignes d'affichage des montants HT soumis à tva
+							$nbtva = count($TTvas);
+							if(!empty($nbtva)){
+								foreach ($TTvas as $tx =>$val){
+									$l = clone $line;
+									$l->product_type = 1;
+									$l->special_code = '';
+									$l->qty = 1;
+									$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+									$l->tva_tx = $tx;
+									$l->total_ht = $val['total_ht'];
+									$l->total_tva = $val['total_tva'];
+									$l->total = $line->total_ht;
+									$l->total_ttc = $val['total_ttc'];
+									$TLines[] = $l;
+									array_shift($TTvas);
+							   }
+							}
     					    
-    					    // ajoute la ligne de sous-total
-    					    $TLines[] = $line; 
-    					}
-				    } else {
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					} else {
 				        
-				        if($line->product_type==9 && $line->rowid>0)
-				        {
-				            // ajoute la ligne de sous-total
-				            $TLines[] = $line; 
-				        }
-				    }
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					}
 				    
 					
 				}
@@ -1474,20 +1474,20 @@ 
 			$nbtva = count($TTvas);
 			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
-			        $l = clone $line;
-			        $l->product_type = 1;
-			        $l->special_code = '';
-			        $l->qty = 1;
-			        $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-			        $l->tva_tx = $tx;
-			        $l->total_ht = $val['total_ht'];
-			        $l->total_tva = $val['total_tva'];
-			        $l->total = $line->total_ht;
-			        $l->total_ttc = $val['total_ttc'];
-			        $TLines[] = $l;
-			        array_shift($TTvas);
-			    }
+				foreach ($TTvas as $tx =>$val){
+					$l = clone $line;
+					$l->product_type = 1;
+					$l->special_code = '';
+					$l->qty = 1;
+					$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+					$l->tva_tx = $tx;
+					$l->total_ht = $val['total_ht'];
+					$l->total_tva = $val['total_tva'];
+					$l->total = $line->total_ht;
+					$l->total_ttc = $val['total_ttc'];
+					$TLines[] = $l;
+					array_shift($TTvas);
+				}
 			}
 			
 			global $nblignes;
@@ -1499,7 +1499,7 @@ 
 				$this->resprints = '';
 				return 0;
 			}
-	    }
+		}
 		
 		return 0;
 	}
@@ -1662,18 +1662,18 @@ 
 		}
 		elseif($object->element == 'order_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->commande->creer;
+			$createRight = $user->rights->fournisseur->commande->creer;
 		}
 		elseif($object->element == 'invoice_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->facture->creer;
+			$createRight = $user->rights->fournisseur->facture->creer;
 		}
 		
 		if($line->special_code!=$this->module_number || $line->product_type!=9) {
 			null;
 		}	
 		else if (in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('invoicereccard',$contexts)) 
-        {
+		{
 			if($object->element=='facture')$idvar = 'facid';
 			else $idvar='id';
 			
@@ -1720,7 +1720,7 @@ 
 			//var_dump($line);
             
 			// HTML 5 data for js
-            $data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
+			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
             
 			
 			?>
@@ -1778,8 +1778,8 @@ 
 						}
 						
 						if ($object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
-						    $line->label = !empty($line->description) ? $line->description : $line->desc;
-						    $line->description = '';
+							$line->label = !empty($line->description) ? $line->description : $line->desc;
+							$line->description = '';
 						}
 						$newlabel = $line->label;
 						if($line->label=='' && !$isFreeText) {
@@ -2158,80 +2158,80 @@ 
 	{
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-	    $line = &$parameters['line'];
+		$line = &$parameters['line'];
 	    
-	    $ThtmlData['data-id']           = $line->id;
-	    $ThtmlData['data-product_type'] = $line->product_type;
-	    $ThtmlData['data-qty']          = 0; //$line->qty;
-	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
+		$ThtmlData['data-id']           = $line->id;
+		$ThtmlData['data-product_type'] = $line->product_type;
+		$ThtmlData['data-qty']          = 0; //$line->qty;
+		$ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 	    
-	    if(TSubtotal::isTitle($line)){
-	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
-	        $ThtmlData['data-issubtotal'] = 'subtotal';
-	    }
-	    else{
-	        $ThtmlData['data-issubtotal'] = 'freetext';
-	    }
+		if(TSubtotal::isTitle($line)){
+			$ThtmlData['data-issubtotal'] = 'title';
+		}elseif(TSubtotal::isSubtotal($line)){
+			$ThtmlData['data-issubtotal'] = 'subtotal';
+		}
+		else{
+			$ThtmlData['data-issubtotal'] = 'freetext';
+		}
 	    
 	    
-	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+		// Change or add data  from hooks
+		$parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
 	    
-	    // hook 
-	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-	    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    if ($reshook>0)
-	    {
-	        $ThtmlData = $hookmanager->resArray;
-	    }
-
-	    return $this->implodeHtmlData($ThtmlData);
+		// hook 
+		$reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook>0)
+		{
+			$ThtmlData = $hookmanager->resArray;
+		}
+
+		return $this->implodeHtmlData($ThtmlData);
 	
 	}
 	
 	
 	function implodeHtmlData($ThtmlData = array())
 	{
-	    $data = '';
-	    foreach($ThtmlData as $k => $h )
-	    {
-	        if(is_array($h))
-	        {
-	            $h = json_encode($h);
-	        }
+		$data = '';
+		foreach($ThtmlData as $k => $h )
+		{
+			if(is_array($h))
+			{
+				$h = json_encode($h);
+			}
 	        
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
-	    }
+			$data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
+		}
 	    
-	    return $data;
+		return $data;
 	}
 	
 	function _ajax_block_order_js($object)
 	{
-	    global $conf,$tagidfortablednd,$filepath,$langs;
+		global $conf,$tagidfortablednd,$filepath,$langs;
 	    
-	    /*
+		/*
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
 	     */
 	    
-	    $id=$object->id;
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+		$id=$object->id;
+		$nboflines=(isset($object->lines)?count($object->lines):0);
+		$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 	    
-	    $id=$object->id;
-	    $fk_element=$object->fk_element;
-	    $table_element_line=$object->table_element_line;
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-	    $filepath=(empty($filepath)?'':$filepath);
+		$id=$object->id;
+		$fk_element=$object->fk_element;
+		$table_element_line=$object->table_element_line;
+		$nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
+		$tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
+		$filepath=(empty($filepath)?'':$filepath);
 	    
 	    
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
-	    {
+		if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
+		{
 	        
-	        ?>
+			?>
 		
 		
 			<script type="text/javascript">