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

68395 Commits

Author SHA1 Message Date
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
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
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
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +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
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
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
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +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
6e64a20f9e
Update filecheck.php 2019-12-13 11:16:46 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php 2019-12-13 10:44:12 +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
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
Mistral Oz - LWEP
b92ec604ec
New model "Excel 2007" : first col at wrong position 
The first column start at id 0 instead of id 1. At id 0, the first column move at Z position. 
Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
 2019-12-10 18:25:30 +01:00
Gérald Lelarge
97ec8b8e02 FIX #12665 Mass invoice validation with stock management 
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
 2019-12-10 14:23:48 +01:00
Gérald Lelarge
5d61e53140 FIX #12665 Mass invoice validation with stock management 
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
 2019-12-10 14:16:15 +01:00
Frédéric FRANCE
f4674a7558
doxygen and $db bot defined 2019-12-10 07:51:39 +01:00
Laurent Destailleur
c0e23c7b71
Merge pull request #12670 from frederic34/patch-7 
The variable $id seems to be never defined
 2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0
The variable $id seems to be never defined 2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6
typo 2019-12-09 23:15:15 +01:00
Laurent Destailleur
24e9d3fdf0
Merge pull request #12631 from atm-florianm/FIX_10.0_backporting_duration_fix_from_develop 
FIX 10.0: do not display single-letter duration values in product list
 2019-12-09 17:43:32 +01:00
Frédéric FRANCE
407fe902b4
missing $db for line 711 2019-12-09 16:42:57 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card 
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
 2019-12-09 15:59:55 +01:00
Laurent Destailleur
1401daba39
Merge pull request #12667 from glelarge/12665-mass_invoice_validation_with_stock_management 
FIX #12665 Mass invoice validation with stock management
 2019-12-09 15:58:14 +01:00
Gérald Lelarge
903c3771ba FIX #12665 Mass invoice validation with stock management 
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
 2019-12-09 14:59:30 +01:00
Laurent Destailleur
94ae8e07af
Merge pull request #12642 from frederic34/patch-11 
fix #12628
 2019-12-09 13:54:20 +01:00
Laurent Destailleur
f28e4c14e8 FIX #12644 2019-12-09 13:40:26 +01:00
Laurent Destailleur
70a8d93f6e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-09 13:27:40 +01:00
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:27:30 +01:00
Laurent Destailleur
63a26ed436 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-09 13:25:49 +01:00
Laurent Destailleur
f2c7d3de2e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-12-09 13:25:23 +01:00
Laurent Destailleur
5dbf060f00 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-12-09 13:24:01 +01:00
Laurent Destailleur
53149bb7cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2019-12-08 04:22:50 +01:00
Laurent Destailleur
394104291a Fix function not found when creating a payment of an expense report 2019-12-08 04:22:09 +01:00
Laurent Dinclaux
f51a68ceb1 Takepos: Well align the search field width, keep old CSS rule as fallback for old browsers 2019-12-07 15:36:23 +11:00
Frédéric FRANCE
cafe26cfc3
Update card.php 2019-12-06 23:23:57 +01:00
Laurent Destailleur
d73bd3ee9a Fix a supplier ref is mandatory for import 2019-12-06 18:43:13 +01:00
Laurent Destailleur
22f575dad0
Merge pull request #12633 from atm-lena/FIX_getrights_request 
FIX getrights() request
 2019-12-06 16:22:47 +01:00
atm-lena
486f598067 FIX getrights() request 2019-12-05 16:11:12 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Florian Mortgat
139419c3e8 FIX 10.0: do not display single-letter values (indicating duration unit without value) in product list 
(this fix exists in develop)
 2019-12-05 10:38:03 +01:00
Laurent Destailleur
18464de297 Clean old file 2019-12-04 22:08:32 +01:00
Laurent Destailleur
89dd74c115 Fix clean old files 2019-12-04 22:05:09 +01:00
Laurent Destailleur
13acb8537d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-12-03 22:38:10 +01:00
Laurent Destailleur
a75915a7a8 Fix regression 2019-12-03 22:37:58 +01:00
Laurent Destailleur
8006d08e6b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-03 22:36:37 +01:00
Laurent Destailleur
60d3bd0fe9 Fix regression 2019-12-03 22:36:26 +01:00
Laurent Destailleur
21a0e962ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-03 22:35:01 +01:00
Laurent Destailleur
558e0cb5f6 Fix regression 2019-12-03 22:34:49 +01:00
gauthier
cec54d6ce0 FIX : when we need to bill several orders, order lines unit is not on bill lines 2019-12-03 16:40:35 +01:00
Laurent Destailleur
606a13898c
Merge pull request #12394 from mapiolca/patch-15 
Fix problem of display photo in the model
 2019-12-03 16:16:57 +01:00
Laurent Destailleur
d153918a10 Fix trans 2019-12-03 15:00:52 +01:00
Laurent Destailleur
78acf07e4c Fix bad side effect of debugbar with android 2019-12-03 14:59:05 +01:00
Laurent Destailleur
d6ef77e895
Merge pull request #12603 from atm-florianm/NEW_9.0_mysqldump_export_enable_using_--quick_option 
NEW 9.0: enable user to use the mysqldump '--quick' option
 2019-12-03 14:36:01 +01:00
Laurent Destailleur
cb62844472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-03 13:52:53 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +01:00
Laurent Destailleur
072db96b11 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-03 13:48:38 +01:00
Laurent Destailleur
5835d49ae1
Merge pull request #12613 from ptibogxiv/patch-288 
Fix title of transactions list
 2019-12-03 13:22:02 +01:00
Laurent Destailleur
e08eca2bf9
Merge pull request #12611 from ptibogxiv/patch-287 
Fix stripe menu
 2019-12-03 13:19:22 +01:00
ptibogxiv
636da4518f
Fix title of transactions list 2019-12-03 11:22:00 +01:00
ptibogxiv
b67fb8be02
Fix stripe menu 2019-12-03 00:14:05 +01:00
ptibogxiv
15715aa12c
FIX not fee in payout list 2019-12-02 23:53:01 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option 
(useful if the server has low RAM or large tables)
 2019-12-02 16:54:05 +01:00
Laurent Destailleur
66571df449 Fix remove a link that is private 2019-12-02 15:19:14 +01:00
John Botella
4a33ee60f8 Fix user card : use comma in amounts inputs 2019-12-02 10:34:14 +01:00
Laurent Destailleur
87e81f1afd
Merge pull request #12583 from atm-maxime/fix_supplier_proddesc 
Fix #12044 : with replenish function, use product supplier desc in order
 2019-12-01 11:51:22 +01:00
Maxime Kohlhaas
d76608729b Fix #12569 : update qty on expensereport prevented decimals 2019-12-01 10:50:28 +01:00
Laurent Destailleur
bf99e8af5d Fix phpcs 2019-12-01 10:33:55 +01:00
Laurent Destailleur
971add1c2f Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-12-01 10:30:33 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00