lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-18 12:26:05 +01:00
commit ea93c687a2
5 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/modProduct.class.php
View File

@ -175,7 +175,7 @@ class modProduct extends DolibarrModules
'p.accountancy_code_sell'=>"ProductAccountancySellCode", 'p.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode", 'p.accountancy_code_sell'=>"ProductAccountancySellCode", 'p.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
'p.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", 'p.accountancy_code_buy'=>"ProductAccountancyBuyCode", 'p.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", 'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",
'p.note'=>"NotePrivate",'p.note_public'=>'NotePublic', 'p.note'=>"NotePrivate",'p.note_public'=>'NotePublic',
'p.weight'=>"Weight", 'p.weight_units'=>"WeightUnits", 'p.length'=>"Length", 'p.width'=>"Width", 'p.height'=>"Height", 'p.length_units'=>"SizeUnits", 'p.weight'=>"Weight", 'p.weight_units'=>"WeightUnits", 'p.length'=>"Length", 'p.length_units'=>"LengthUnits", 'p.width'=>"Width", 'p.width_units'=>"WidthUnits", 'p.height'=>"Height", 'p.height_units'=>"HeightUnits",
'p.surface'=>"Surface", 'p.surface_units'=>"SurfaceUnits", 'p.volume'=>"Volume", 'p.volume_units'=>"VolumeUnits", 'p.surface'=>"Surface", 'p.surface_units'=>"SurfaceUnits", 'p.volume'=>"Volume", 'p.volume_units'=>"VolumeUnits",
'p.duration'=>"Duration", 'p.duration'=>"Duration",
'p.finished' => 'Nature', 'p.finished' => 'Nature',
@ -382,13 +382,13 @@ class modProduct extends DolibarrModules
'p.weight' => "Weight", 'p.weight' => "Weight",
'p.weight_units' => "WeightUnits", 'p.weight_units' => "WeightUnits",
'p.length' => "Length", 'p.length' => "Length",
'p.length_units' => "LengthUnit", 'p.length_units' => "LengthUnits",
'p.width' => "Width", 'p.width' => "Width",
'p.width_units' => "WidthUnits", 'p.width_units' => "WidthUnits",
'p.height' => "Height", 'p.height' => "Height",
'p.height_units' => "HeightUnit", 'p.height_units' => "HeightUnits",
'p.surface' => "Surface", 'p.surface' => "Surface",
'p.surface_units' => "SurfaceUnit", 'p.surface_units' => "SurfaceUnits",
'p.volume' => "Volume", 'p.volume' => "Volume",
'p.volume_units' => "VolumeUnits", 'p.volume_units' => "VolumeUnits",
'p.duration' => "Duration",//duration of service 'p.duration' => "Duration",//duration of service

6
htdocs/core/modules/modSociete.class.php
View File

@ -71,7 +71,7 @@ class modSociete extends DolibarrModules
$this->requiredby = array("modExpedition","modFacture","modFournisseur","modFicheinter","modPropale","modContrat","modCommande"); // List of module ids to disable if this one is disabled $this->requiredby = array("modExpedition","modFacture","modFournisseur","modFicheinter","modPropale","modContrat","modCommande"); // List of module ids to disable if this one is disabled
$this->conflictwith = array(); // List of module class names as string this module is in conflict with $this->conflictwith = array(); // List of module class names as string this module is in conflict with
$this->phpmin = array(5,4); // Minimum version of PHP required by module $this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->langfiles = array("companies",'bills'); $this->langfiles = array("companies","bills","compta","admin","banks");
// Constants // Constants
$this->const = array(); $this->const = array();
@ -412,7 +412,7 @@ class modSociete extends DolibarrModules
's.address' => "Address", 's.address' => "Address",
's.zip' => "Zip", 's.zip' => "Zip",
's.town' => "Town", 's.town' => "Town",
's.fk_departement' => "StateId", 's.fk_departement' => "StateCode",
's.fk_pays' => "CountryCode", 's.fk_pays' => "CountryCode",
's.phone' => "Phone", 's.phone' => "Phone",
's.fax' => "Fax", 's.fax' => "Fax",
@ -583,7 +583,7 @@ class modSociete extends DolibarrModules
's.address' => "Address", 's.address' => "Address",
's.zip' => "Zip", 's.zip' => "Zip",
's.town' => "Town", 's.town' => "Town",
's.fk_departement' => "StateId", 's.fk_departement' => "StateCode",
's.fk_pays' => "CountryCode", 's.fk_pays' => "CountryCode",
's.birthday' => "BirthdayDate", 's.birthday' => "BirthdayDate",
's.poste' => "Role", 's.poste' => "Role",

6
htdocs/core/modules/modUser.class.php
View File

@ -69,7 +69,7 @@ class modUser extends DolibarrModules
$this->requiredby = array(); // List of module ids to disable if this one is disabled $this->requiredby = array(); // List of module ids to disable if this one is disabled
$this->conflictwith = array(); // List of module class names as string this module is in conflict with $this->conflictwith = array(); // List of module class names as string this module is in conflict with
$this->phpmin = array(5,4); // Minimum version of PHP required by module $this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->langfiles = array("main","users","companies","members",'salaries'); $this->langfiles = array("main","users","companies","members","salaries","hrm");
$this->always_enabled = true; // Can't be disabled $this->always_enabled = true; // Can't be disabled
// Constants // Constants
@ -225,7 +225,7 @@ class modUser extends DolibarrModules
'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town", 'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",
'u.office_phone'=>'Phone','u.user_mobile'=>"Mobile",'u.office_fax'=>'Fax', 'u.office_phone'=>'Phone','u.user_mobile'=>"Mobile",'u.office_fax'=>'Fax',
'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature', 'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature',
'u.fk_user'=>'Supervisor','u.thm'=>'THM','u.tjm'=>'TJM','u.weeklyhours'=>'WeeklyHours', 'u.fk_user'=>'HierarchicalResponsible','u.thm'=>'THM','u.tjm'=>'TJM','u.weeklyhours'=>'WeeklyHours',
'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey', 'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey',
'u.birth'=>'BirthdayDate', 'u.birth'=>'BirthdayDate',
'u.datec'=>"DateCreation",'u.tms'=>"DateLastModification", 'u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",
@ -281,7 +281,7 @@ class modUser extends DolibarrModules
'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode", 'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode",
'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax", 'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax",
'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature', 'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature',
'u.fk_user'=>'Supervisor','u.thm'=>'THM','u.tjm'=>'TJM','u.weeklyhours'=>'WeeklyHours', 'u.fk_user'=>'HierarchicalResponsible','u.thm'=>'THM','u.tjm'=>'TJM','u.weeklyhours'=>'WeeklyHours',
'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey', 'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey',
'u.birth'=>'BirthdayDate', 'u.birth'=>'BirthdayDate',
'u.datec'=>"DateCreation", 'u.datec'=>"DateCreation",

1
htdocs/langs/en_US/companies.lang
View File

@ -57,6 +57,7 @@ NatureOfThirdParty=Nature of Third party
NatureOfContact=Nature of Contact NatureOfContact=Nature of Contact
Address=Address Address=Address
State=State/Province State=State/Province
StateCode=State/Province code
StateShort=State StateShort=State
Region=Region Region=Region
Region-State=Region - State Region-State=Region - State

30
htdocs/langs/en_US/products.lang
View File

@ -188,13 +188,38 @@ unitSET=Set
unitS=Second unitS=Second
unitH=Hour unitH=Hour
unitD=Day unitD=Day
unitKG=Kilogram
unitG=Gram unitG=Gram
unitM=Meter unitM=Meter
unitLM=Linear meter unitLM=Linear meter
unitM2=Square meter unitM2=Square meter
unitM3=Cubic meter unitM3=Cubic meter
unitL=Liter unitL=Liter
unitT=ton
unitKG=kg
unitG=g
unitMG=mg
unitLB=pound
unitOZ=ounce
unitM=m
unitDM=dm
unitCM=cm
unitMM=mm
unitFT=ft
unitIN=in
unitM2=m²
unitDM2=dm²
unitCM2=cm²
unitMM2=mm²
unitFT2=ft²
unitIN2=in²
unitM3=m³
unitDM3=dm³
unitCM3=cm³
unitMM3=mm³
unitFT3=ft³
unitIN3=in³
unitOZ3=ounce
unitgallon=gallon
ProductCodeModel=Product ref template ProductCodeModel=Product ref template
ServiceCodeModel=Service ref template ServiceCodeModel=Service ref template
CurrentProductPrice=Current price CurrentProductPrice=Current price
@ -287,6 +312,9 @@ ProductWeight=Weight for 1 product
ProductVolume=Volume for 1 product ProductVolume=Volume for 1 product
WeightUnits=Weight unit WeightUnits=Weight unit
VolumeUnits=Volume unit VolumeUnits=Volume unit
WidthUnits=Width unit
LengthUnits=Length unit
HeightUnits=Height unit
SurfaceUnits=Surface unit SurfaceUnits=Surface unit
SizeUnits=Size unit SizeUnits=Size unit
DeleteProductBuyPrice=Delete buying price DeleteProductBuyPrice=Delete buying price