Commit Graph

87441 Commits

Author SHA1 Message Date
Laurent Destailleur
d44952011f
Update balance.php 2020-09-12 01:16:02 +02:00
Alexandre SPANGARO
04329c38b3 FIX - Accountancy balance Error SQL on entity 2020-09-11 06:42:22 +02:00
Laurent Destailleur
05a2fc6186 Fix rate for tunisia 2020-09-10 19:40:03 +02:00
Laurent Destailleur
358f8357f9 FIX #14703 2020-09-10 18:25:38 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
Laurent Destailleur
c3ac446cf2
Merge pull request #14674 from ATM-Consulting/12.0_FIX_stock_is_not_rounded_on_product_list
FIX: round stock value on product list
2020-09-09 14:54:42 +02:00
Laurent Destailleur
5c34b26f39 FIX Look and feel v12: First tab must be name of object 2020-09-09 13:57:35 +02:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
Laurent Destailleur
e7e05f47ac Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-07 14:26:07 +02:00
Laurent Destailleur
ca6e57b2f7 FIX Filter in "billed" of orders was not saved 2020-09-07 14:25:50 +02:00
Laurent Destailleur
92e231e121
Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty
FIX: lang fr retained warranty
2020-09-07 12:46:32 +02:00
John Botella
10d3405219 FIX: lang fr retained warranty 2020-09-07 12:21:00 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction
Conflicts:
	htdocs/product/stock/product.php
2020-09-04 19:38:56 +02:00
Laurent Destailleur
2e609d448c Fix error message 2020-09-04 16:30:34 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
Laurent Destailleur
4c0e1d20d6 FIX CSS 2020-08-30 05:28:01 +02:00
Laurent Destailleur
f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-08-29 05:13:20 +02:00
Laurent Destailleur
e4e5ca3934 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:41 +02:00
Laurent Destailleur
84b2929604 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:34 +02:00
Laurent Destailleur
eb0c76f613 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-08-29 05:08:59 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
Laurent Destailleur
68286199eb
Merge pull request #14574 from ATM-Consulting/11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot
FIX 11.0 - expenses lines overlapping the total amounts frame
2020-08-28 21:10:04 +02:00
FlorianMortgat
c25463a4ba + more parentheses around expression for readability 2020-08-28 21:07:11 +02:00
FlorianMortgat
173ad057f9 + parentheses around expression for readability 2020-08-28 20:46:35 +02:00
Laurent Destailleur
4d622316a8
Merge pull request #14579 from ATM-Consulting/10.0_FIX_wrong_supplier_unit_price_calculation_when_accepting_supplier_price_proposal
FIX: unit price divided by quantity when accepting supplier price pro…
2020-08-28 17:48:11 +02:00
Florian Mortgat
215085e0e6 FIX: unit price divided by quantity when accepting supplier price proposal 2020-08-28 15:51:39 +02:00
Florian Mortgat
7ddf85cd33 Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot 2020-08-28 10:05:00 +02:00
Florian Mortgat
a5d1f1f68f FIX: expenses lines overlapping the frame for total amounts.
If there is no room for this frame when printing the last expense line, this line should be on a new page.
2020-08-28 10:02:43 +02:00
Laurent Destailleur
ad63434f3e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/prelevement/index.php
2020-08-27 22:00:10 +02:00
Laurent Destailleur
e52d71a880 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-27 21:58:29 +02:00
Laurent Destailleur
00fce1d18a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-27 21:58:23 +02:00
Laurent Destailleur
57951e1285 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-27 21:52:47 +02:00
Laurent Destailleur
c6bdd27d4c FIX #14530 2020-08-27 21:52:25 +02:00
Laurent Destailleur
593f3b81e5
Merge pull request #14559 from OPEN-DSI/v10-fix-societe-card-add-sales-representatives
FIX set sales representatives on create company card
2020-08-27 20:14:31 +02:00
Laurent Destailleur
e95361fed4
Merge pull request #14536 from ptibogxiv/patch-347
Fix for better code
2020-08-27 19:57:34 +02:00
Laurent Destailleur
dda5775dd6
Merge pull request #14563 from atm-florianm/11.0_FIX_prelevement_top5_multicompany
FIX: missing entity check
2020-08-27 19:46:45 +02:00
Laurent Destailleur
84a096e234
Merge pull request #14555 from aspangaro/12.0p8
Fix Accountancy Listbyaccount Error missing class on formfile->getDocumentsLink
2020-08-27 19:45:55 +02:00
Laurent Destailleur
243f59b9e9 FIX Missing transaction on PO actions 2020-08-26 17:09:45 +02:00
Florian Mortgat
9b3f13458f FIX: missing entity check 2020-08-26 16:02:31 +02:00
lvessiller
9268955256 FIX set sales representatives on create company card 2020-08-26 09:40:20 +02:00
Alexandre SPANGARO
0adf267f66 Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink 2020-08-25 21:31:04 +02:00
Laurent Destailleur
05d82a0684 FIX Error management. Do no try to approve PO if validation fails. 2020-08-24 17:07:30 +02:00
ptibogxiv
ff621cb146
Update pay.php 2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955
Fix for better code 2020-08-24 12:26:40 +02:00
Laurent Destailleur
0944e8b156 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:13 +02:00
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
Laurent Destailleur
d765b03bd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-23 19:23:57 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a Fix include regression 2020-08-23 19:22:01 +02:00