Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 18:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,589 Commits 36 Branches 190 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

78589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e9ee7a23e6 Merge pull request #13573 from frederic34/patch-11 
Update actioncomm.class.php
 2020-04-12 16:42:07 +02:00
Maxime Kohlhaas
3ca0d48b37 Fix warning on shipment because of count func 2020-04-12 10:45:30 +02:00
Frédéric FRANCE
e2660fd31c Update actioncomm.class.php 2020-04-11 22:38:28 +02:00
Maxime Kohlhaas
f5ab957faf FIX #13535 : state in italian address 2020-04-11 17:56:23 +02:00
Laurent Destailleur
70e71d32c7 Merge pull request #13555 from atm-gauthier/fix_cabyprodserv 
FIX : some others modules (like subtotal) use other product_type than…
 2020-04-10 20:03:56 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
Laurent Destailleur
a1e714f123 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:01:31 +02:00
Laurent Destailleur
f52f59e80a Merge pull request #13540 from atm-gauthier/10.0_quote 
FIX : IHM, unexpected quote
 2020-04-09 19:43:39 +02:00
gauthier
3327f1c074 FIX : IHM, unexpected quote 2020-04-09 11:53:03 +02:00
Laurent Destailleur
49c38042a9 Merge pull request #13504 from atm-quentin/10.0_fix_author_supplier_proposal 
FIX author search supplier proposal list
 2020-04-08 14:47:17 +02:00
Laurent Destailleur
2ec60c9d55 Merge pull request #13508 from hregis/8.0_mc3 
FIX missing member entity
 2020-04-07 21:14:06 +02:00
Regis Houssin
34e434a17e FIX missing member entity 2020-04-06 16:36:11 +02:00
atm-quentin
9950295e41 FIX author search supplier proposal list 2020-04-06 10:29:04 +02:00
Laurent Destailleur
e32ac7644d FIX Send email from bulk action of list of thirdparties 2020-04-05 15:31:18 +02:00
Laurent Destailleur
eac75497c0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:12 +02:00
Laurent Destailleur
d0c4af5855 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:05 +02:00
Laurent Destailleur
8a14652eae Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code 
FIX missing default accountancy product buy code
 2020-04-05 03:41:46 +02:00
Laurent Destailleur
683ddac0d4 Merge pull request #13493 from ptibogxiv/patch-320 
FIX child categories only with good entity rights
 2020-04-05 02:40:43 +02:00
ptibogxiv
c7cdb64087 FIX child categories only with good entity rights 
fix v9 to develop
display only categories with good entity rights ( intradolibarr or via REST API)
 2020-04-04 11:07:48 +02:00
Laurent Destailleur
733814a8a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-02 18:51:36 +02:00
Laurent Destailleur
7cee643c05 Prepare 10.0.8 2020-04-02 18:51:25 +02:00
Laurent Destailleur
3c75c29e6b Merge pull request #13463 from atm-quentin/FIX_buyprice_filter_was_only_qty 
FIX : Buyprice was updated only if min price for this qty had same qty
 2020-04-02 13:08:40 +02:00
Laurent Destailleur
3b6db77cb3 Merge pull request #13460 from atm-quentin/FIX_multicurrency_SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL 
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRIC…
 2020-04-02 13:04:00 +02:00
Laurent Destailleur
c6f57c46a8 Update supplier_proposal.class.php 2020-04-02 13:01:49 +02:00
Laurent Destailleur
a923ef5a6d Merge pull request #13456 from atm-gauthier/9.0_fix_migrate_picture_path_script 
FIX : picture migration script from doli 9.0
 2020-04-02 12:50:23 +02:00
Laurent Destailleur
a7656793da Merge pull request #13479 from altatof/md 
FIX md stylesheet to be included by external modules like eldy
 2020-04-02 12:40:10 +02:00
Laurent Destailleur
5622c1947b Prepare 10.0.7 10.0.7 2020-04-02 12:23:53 +02:00
altairis
a743110f03 FIX md stylesheet to be included by external modules like eldy 2020-04-02 10:44:24 +02:00
stickler-ci
1f5da36fdb Fixing style errors. 2020-03-31 13:02:44 +00:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
atm-quentin
73f6c9210f FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL 2020-03-31 11:03:08 +02:00
gauthier
04564e83ea FIX : picture migration script from doli 9.0 2020-03-31 10:31:18 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
474260e526 Merge pull request #13447 from c3do/patch-1 
Fix can set desiredstock to (int) 0 from API Rest
 2020-03-30 19:46:02 +02:00
Laurent Destailleur
7466eaade3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Laurent Destailleur
06ad21f2e8 Merge pull request #13442 from fappels/9.0_newToken 
Improve modulebuilder compatiblity with maintained versions.
 2020-03-30 19:35:45 +02:00
Laurent Destailleur
ff44e2d2ac Merge pull request #13448 from atm-quentin/FIX_missing_array_option_supplier_proposal_to_supplier_order 
FIX missing array option
 2020-03-30 19:35:20 +02:00
atm-quentin
9a92545d8d FIX missing default accountancy product buy code 2020-03-30 14:28:22 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Cédric
eead9a93d3 Fix can set desiredstock to (int) 0 from API Rest 
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
 2020-03-30 13:03:13 +02:00
Francis Appels
3eda785ca5 Add newline end of file 2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab Add token functions to improve modulebuilder compatiblity with maintained versions. 2020-03-30 10:28:20 +02:00
Laurent Destailleur
30379b4cba Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	.travis.yml
 2020-03-26 03:57:02 +01:00