lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,173 Commits 43 Branches 150 Tags 886 MiB
90d1b2d349
Commit Graph

88173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
90d1b2d349 Prepare 12.0.5 2021-02-10 18:05:36 +01:00
Laurent Destailleur
9c535d6d7e Fix comment in js must be a js comment 2021-02-09 21:09:46 +01:00
Laurent Destailleur
0e2c27d795 Fix javascript error 2021-02-09 21:06:11 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES 
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
 2021-02-09 13:39:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement 
12 fix error assignement
 2021-02-09 13:22:57 +01:00
Laurent Destailleur
8acc5e1486 Fix calculation of profit 2021-02-08 23:37:32 +01:00
Florian HENRY
6bcb63c53d fix indent 2021-02-08 20:46:59 +01:00
Florian HENRY
ff6b5c768d fix indent 2021-02-08 20:46:21 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Laurent Destailleur
8b3c872f2a Fix warning 2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning 
FIX: warning when adding a line if $remise_percent is an empty string
 2021-02-08 17:34:29 +01:00
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
78052e3239 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:24 +01:00
Laurent Destailleur
a143635f53 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:17 +01:00
Laurent Destailleur
25823d7b90
Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY 
Add hidden conf to display supplier in object lines
 2021-02-08 16:58:28 +01:00
Laurent Destailleur
ff9070ff9c
Merge pull request #16206 from atm-maxime/fix_supp_inv_backtolistlink 
Fix links to go back on supplier invoice list
 2021-02-08 15:04:23 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +01:00
Laurent Destailleur
cb94216098
Merge pull request #16205 from atm-maxime/fix_supp_inv_list_leftjoin 
Fix #15940 mixing different joins
 2021-02-07 19:58:33 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Laurent Destailleur
d8a33b46de Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-06 01:08:46 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
c888ce08c1
Merge pull request #16174 from atm-florianm/fix/10.0_check_withdrawal_already_credited_before_crediting_it 
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
 2021-02-06 01:00:56 +01:00
Laurent Destailleur
7d14cde45e
Merge pull request #16173 from fappels/11_backport_price_patch 
FIX: Add critical price patch from 12 to 11.
 2021-02-06 00:59:52 +01:00
Laurent Destailleur
d8c262691b
Merge pull request #16175 from nicolas-eoxia/12_fix_missing_hook 
fix: add missing hook addMoreActionsButtons in viewcat.php
 2021-02-06 00:43:52 +01:00
Laurent Destailleur
e9fa5a647d Fix import 2021-02-05 14:35:10 +01:00
Nicolas
cdd2c165ef add missing hook addMoreActionsButtons in viewcat.php 2021-02-05 11:36:12 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Francis Appels
1b55935577 Add critical price patch from 12 to 11. 2021-02-05 10:39:46 +01:00
Laurent Destailleur
3006cf770c FIX Timeout during import 2021-02-05 01:06:59 +01:00
Laurent Destailleur
b58b3a4932 FIX link to create event when task is in a project with a thirdparty 2021-02-04 13:03:05 +01:00
atm-lena
c5f73ec12a Resolve ret 2021-02-04 10:42:42 +01:00
Laurent Destailleur
91c594a66a Fix syntax error 2021-02-03 23:03:47 +01:00
Laurent Destailleur
041decaf93 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:39 +01:00
Laurent Destailleur
4bba124c3f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:32 +01:00
Laurent Destailleur
2576973dc3
Merge pull request #16140 from OPEN-DSI/v11-fix-model-mail-selected 
FIX select default mail template
 2021-02-03 20:26:40 +01:00
Laurent Destailleur
83e32f96b7
Merge pull request #16138 from ibuiv/patch-3 
FIX(path) htdocs removed
 2021-02-03 20:25:02 +01:00
Laurent Destailleur
c16ed62ada
Merge pull request #16149 from ptibogxiv/patch-410 
FIX cash fence for takepos with multientity
 2021-02-03 19:57:21 +01:00
Laurent Destailleur
8b6de8fe26 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 17:09:56 +01:00
Laurent Destailleur
6ab723e85c Fix bad path of include 2021-02-03 17:09:26 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
ptibogxiv
3132877349
FIX cash fence for takepos with multientity 2021-02-02 23:09:23 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
ibuiv
fc1d8a2c5b
FIX(path) htdocs removed 2021-02-02 10:01:54 +01:00
Laurent Destailleur
99ccfee9ed
Merge pull request #16120 from pvma/12.0 
Fix/FIX: Show missing notification in Event in user dashboard if assigned by others
 2021-01-31 19:07:59 +01:00
Laurent Destailleur
d023afb66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-31 18:55:11 +01:00
Laurent Destailleur
188ed6984f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-01-31 18:54:32 +01:00
Laurent Destailleur
08aa3eac00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 18:54:19 +01:00