lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,995 Commits 43 Branches 150 Tags 886 MiB
07b40f043e
Commit Graph

77995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
07b40f043e Prepare 10.0.5 2019-12-23 22:44:34 +01:00
Laurent Destailleur
5521d13a11 Prepare 10.0.5 2019-12-23 22:12:50 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
Laurent Destailleur
7b08ce9fb8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 14:01:51 +01:00
Laurent Destailleur
eb32e98127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-23 14:01:00 +01:00
Laurent Destailleur
76d23141fd
Merge pull request #12727 from fappels/patch-1 
Update 6.0.0-7.0.0.sql
 2019-12-23 14:00:15 +01:00
Laurent Destailleur
1229e8bc4b
Merge pull request #12747 from OPEN-DSI/v10-fix-contact-card-select-state 
FIX contact card state address selected after filling address
 2019-12-23 13:47:16 +01:00
Laurent Destailleur
15031a3e87
Merge pull request #12746 from OPEN-DSI/v10-fix-categories-traduction-backurl 
FIX add and modify category translate form with posted values on errors
 2019-12-23 13:44:37 +01:00
Laurent Destailleur
93cece6a3a
Merge pull request #12738 from mapiolca/patch-16 
#FIX Error Margin with Situation Invoice
 2019-12-23 13:43:18 +01:00
Laurent Destailleur
b3400fac24
Merge pull request #12744 from OPEN-DSI/v10-fix-facture-duedate-and-paid 
FIX set due date in object in create invoice
 2019-12-23 13:42:31 +01:00
Laurent Destailleur
e963fa4b07 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 13:40:49 +01:00
Laurent Destailleur
4d12ecb072 FIX #12745 2019-12-23 13:40:35 +01:00
VESSILLER
e59514600b FIX contact card state address selected after filling address 2019-12-23 12:10:51 +01:00
VESSILLER
558d577309 FIX add and modify category translate form with posted values on errors 2019-12-23 11:53:19 +01:00
VESSILLER
c39e45b81a FIX set due date in object in create invoice 2019-12-23 10:57:51 +01:00
Laurent Destailleur
77ab6604fd
Merge pull request #12740 from mapiolca/patch-17 
FIX Invoice Situation integration into Margin
 2019-12-22 21:39:15 +01:00
Laurent Destailleur
adb4f33312
Merge pull request #12743 from hregis/10.0_mc 
FIX missing nl2br conversion
 2019-12-22 11:41:01 +01:00
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Pierre Ardoin
91e2fe9a99
Update to integer situation invoice 
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)

Now : Situation invoice with situation_percent  < 100 => Correct and proportional.
 2019-12-19 12:06:18 +01:00
Pierre Ardoin
a82f996fcf
Update to integer situation invoice 
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)

Now : Situation invoice with situation_percent  < 100 => Correct and proportional.
 2019-12-19 12:04:48 +01:00
Pierre Ardoin
347eae05ac
Update to integer situation invoice 
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)

Now : Situation invoice with situation_percent  < 100 => Correct and proportional.
 2019-12-19 12:03:09 +01:00
Pierre Ardoin
14cf295f22
Update to integer situation invoice 
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)

Now : Situation invoice with situation_percent  < 100 => Correct and proportional.
 2019-12-19 11:58:25 +01:00
Pierre Ardoin
063c139fee
Situation Invoice Compatibility 
take progress percent into account in buying price
 2019-12-19 11:52:30 +01:00
Pierre Ardoin
538921f479
#FIX Error Margin with Situation Invoice 
Fix an issue that show a negative margin when $line->situation_percent is not 100%

Now, the margin price take progress into account.
 2019-12-19 10:35:38 +01:00
Laurent Destailleur
5863319660
Merge pull request #12735 from ptibogxiv/patch-290 
Fix day scale unit
 2019-12-19 10:25:59 +01:00
ptibogxiv
6789b7bd1e
Fix day scale unit 2019-12-18 18:23:31 +01:00
Laurent Destailleur
ea93c687a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-18 12:26:05 +01:00
Laurent Destailleur
92facbc892
Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad 
FIX : units traductions for selectUnits() function
 2019-12-18 12:21:33 +01:00
Laurent Destailleur
451b32674e Removed duplicate record 2019-12-18 12:15:34 +01:00
Laurent Destailleur
163ba0d480
Merge pull request #12732 from aspangaro/10.0_p11 
Fix language traduction on import/export tools
 2019-12-18 12:05:53 +01:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Laurent Destailleur
cc8a291f28
Merge pull request #12730 from atm-maxime/fix_shipment_close 
Fix prevent double action on shipment close
 2019-12-17 19:35:25 +01:00
Maxime Kohlhaas
3e19702e39 Fix prevent double action on shipment close 2019-12-17 18:05:59 +01:00
Laurent Destailleur
27b1e71cd2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-17 12:45:00 +01:00
Francis Appels
95b56f0518
Update 6.0.0-7.0.0.sql 
timestamp NOT NULL can cause SQL error.
 2019-12-17 12:19:35 +01:00
Laurent Destailleur
7b1bf32cd9
Update products.lang 2019-12-17 12:19:32 +01:00
Laurent Destailleur
cdb730cf4a
Merge pull request #12724 from atm-florian/9.0 
fix: task document tab FATAL without thirdparty
 2019-12-17 12:14:55 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
gauthier
a672673319 FIX : units traductions for selectUnits() function 2019-12-17 11:25:25 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +01:00
Laurent Destailleur
c065afd985
Merge pull request #12715 from atm-john/10.0_fix_document_module_call 
Fix document module call
 2019-12-16 19:03:31 +01:00
John Botella
98bd4f3a66 Fix document module call 2019-12-16 09:44:08 +01:00
Laurent Destailleur
60a0c18338
Merge pull request #12708 from atm-gauthier/10.0_fix_product_fourn_price_id 
FIX : product_fourn_price_id was assigned too late for logPrice() function
 2019-12-14 22:28:11 +01:00
Laurent Destailleur
2c4fd099c8
Update fournisseur.product.class.php 2019-12-14 22:27:45 +01:00
Laurent Destailleur
e9a0646f6f
Update fournisseur.product.class.php 2019-12-14 22:25:34 +01:00
Laurent Destailleur
5e3698b023 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b Fix $db 2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-14 14:34:14 +01:00