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

77954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
e66013275d
Merge pull request #12675 from frederic34/patch-6 
doxygen and $db not defined
 2019-12-10 11:35:46 +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
Laurent Destailleur
7ba5c2e9d8
Merge pull request #12669 from frederic34/patch-6 
typo
 2019-12-10 05:53:13 +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
Laurent Destailleur
314a13a8df
Merge pull request #12668 from frederic34/patch-6 
missing $db for line 711
 2019-12-09 17:33:20 +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
d7390b51cd
Merge pull request #12645 from Gecka-Apps/10.0-takepos-fix-search-width 
Takepos: Well align the search field width, keep old CSS rule as fallback
 2019-12-09 13:22:26 +01:00