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

77977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
27b1e71cd2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-17 12:45:00 +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
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/admin/system/filecheck.php
 2019-12-14 14:33:46 +01:00
Laurent Destailleur
371a2c62bd
Merge pull request #12695 from hregis/10.0_mc 
FIX #12688
 2019-12-14 13:58:43 +01:00
Laurent Destailleur
dcc9f7d8d3
Merge pull request #12696 from atm-gauthier/10.0_fix_updateline_fourn_order_return_mustnot_be_zero 
FIX : CommandeFournisseurLigne update function must not be able to re…
 2019-12-14 13:54:51 +01:00
Laurent Destailleur
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +01:00
Laurent Destailleur
3a4b4e1559
Merge pull request #12706 from frederic34/patch-22 
Update generate_filelist_xml.php
 2019-12-14 13:23:36 +01:00
gauthier
cc1454c8d5 FIX : product_fourn_price_id was assigned too late for logPrice() function 2019-12-13 14:55:39 +01:00
Frédéric FRANCE
bac5c3800e
Update api_setup.class.php 2019-12-13 14:46:27 +01:00
Frédéric FRANCE
50937f8ca1
Update filecheck.php 2019-12-13 12:56:48 +01:00
Frédéric FRANCE
18e3a4bcbb
Update generate_filelist_xml.php 2019-12-13 12:56:02 +01:00
Frédéric FRANCE
6e64a20f9e
Update filecheck.php 2019-12-13 11:16:46 +01:00
Frédéric FRANCE
030b78d79f
Update generate_filelist_xml.php 2019-12-13 11:16:04 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php 2019-12-13 10:44:12 +01:00
Frédéric FRANCE
cad54c6d7a
Update generate_filelist_xml.php 2019-12-13 10:42:49 +01:00
gauthier
a0aa51fe0c FIX : CommandeFournisseurLigne update function must not be able to return other value than 1 if success 2019-12-12 16:46:25 +01:00
Regis Houssin
a527e72124 FIX #12688 2019-12-12 16:35:07 +01:00
Laurent Destailleur
c72e7e6a97
Merge pull request #12682 from mistraloz/patch-2 
FIX : first col at wrong position in Export 2007 (new)
 2019-12-10 19:29:00 +01:00
Laurent Destailleur
22a297ed47
Merge pull request #12680 from glelarge/90/12665-mass_invoice_validation_with_stock_management 
FIX #12665 Mass invoice validation with stock management (branch 9.0)
 2019-12-10 19:27:36 +01:00
Laurent Destailleur
2103cacf9e
Merge pull request #12679 from glelarge/80/12665-mass_invoice_validation_with_stock_management 
FIX #12665 Mass invoice validation with stock management (branch 8.0)
 2019-12-10 19:26:24 +01:00