lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,714 Commits 43 Branches 150 Tags 886 MiB
f02a35d398
Commit Graph

87714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f02a35d398 Fix bad array when year is not defined into graph stat of products 2020-10-28 16:47:00 +01:00
Laurent Destailleur
6363a6cd60 Fix sanitize 2020-10-28 14:11:46 +01:00
Laurent Destailleur
47dfe633f9 Fix filter on date on statistics of products 2020-10-28 13:19:35 +01:00
Laurent Destailleur
5943e784ec Remove var_dump 2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18 Fix label 2020-10-27 10:26:30 +01:00
Laurent Destailleur
ffc961599c FIX error 500 on cash fence 2020-10-27 10:19:00 +01:00
Laurent Destailleur
7806bdabb3
Merge pull request #15177 from Ahuahuachi/12.0-FIX-15161 
FIX #15161 MO translation conflict
 2020-10-27 01:23:26 +01:00
Alfredo Altamirano
214cd2c99b Update references of MO translation string 2020-10-26 15:44:26 -06:00
Alfredo Altamirano
43fd659d2a Rename translation string MO for ManufacturingOrder 2020-10-26 15:38:42 -06:00
Laurent Destailleur
f18a13b2d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:08:11 +01:00
Laurent Destailleur
78a52eda96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/main.inc.php
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:05:30 +01:00
Laurent Destailleur
50ede5224a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-26 19:02:47 +01:00
Laurent Destailleur
c58d3d0cf7 FIX #15163 2020-10-26 19:02:26 +01:00
Laurent Destailleur
ca66df2a7b
Merge pull request #15167 from marc-dll/FIX_10.0_customer_price_triggers 
FIX: product customer prices: missing triggers in CRUD class
 2020-10-26 18:59:44 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Laurent Destailleur
ec0da6921a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-25 21:10:00 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
Laurent Destailleur
b80d135fcb
Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage 
fix mail error message
 2020-10-25 14:50:23 +01:00
Laurent Destailleur
02ef5ad3b9
Merge pull request #15144 from atm-maxime/fix_supp_inv_numbering 
Fix #15064 : error when supplier invoice numbering module is not configured
 2020-10-25 13:58:48 +01:00
Laurent Destailleur
b6db71e5e6
Merge pull request #15146 from atm-maxime/fix_selected_lines_invoice_creation 
Fix #15143 selected lines on invoice creation
 2020-10-25 13:57:00 +01:00
Laurent Destailleur
b02c734c69
Merge pull request #15141 from atm-maxime/fix_bom_rang 
Fix BOM position field
 2020-10-25 13:54:45 +01:00
Laurent Destailleur
d21f51a35e
Merge pull request #15142 from atm-maxime/fix_contract_box_var 
Fix var name in contract box
 2020-10-25 13:54:04 +01:00
Maxime Kohlhaas
309691f1e7 Fix #15143 selected lines on invoice creation 2020-10-25 09:28:41 +01:00
Maxime Kohlhaas
680ae60b6f Fix #15064 : error when supplier invoice numbering module is not configured 2020-10-25 08:56:34 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00
Laurent Destailleur
50da1cd95e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-10-23 17:33:14 +02:00
Laurent Destailleur
377c44eeab
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required 
FIX no empty value in required extrafield
 2020-10-23 17:29:12 +02:00
Florian HENRY
53a76dc01f fix mail error message 2020-10-23 16:39:45 +02:00
Laurent Destailleur
edbf4dc375 Fix doc 2020-10-23 13:55:14 +02:00
Laurent Destailleur
0e25843baa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2020-10-23 03:59:11 +02:00
Laurent Destailleur
c9a73cc380 Fix phpcs 2020-10-23 03:55:18 +02:00
Laurent Destailleur
62420c5e7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2020-10-23 03:51:22 +02:00
Laurent Destailleur
e0e4da481a Fix phpcs 2020-10-23 03:42:54 +02:00
Laurent Destailleur
d9aa83e699 Fix phpcs 2020-10-23 03:41:26 +02:00
Laurent Destailleur
15bbba3f52 Remove warning 2020-10-22 21:55:01 +02:00
Laurent Destailleur
e811a9b13e
Merge pull request #15097 from marc-dll/FIX_10.0_supplier_invoice_echeance 
FIX: supplier invoice: automatically calculate payment term when modifying payment condition
 2020-10-22 18:40:07 +02:00
Laurent Destailleur
b4581b6af8
Better error management 2020-10-22 18:39:45 +02:00
Marc de Lima Lucio
594d9e321e FIX: invoice payment terms edition: error management 2020-10-22 18:28:27 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
a826e328c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:40 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Laurent Destailleur
72505b2ad4
Merge pull request #15101 from FHenry/12.0_fix_autofilldate_payment_expensereport 
fix MAIN_AUTOFILL_DATE for expense payment date
 2020-10-22 16:58:55 +02:00