Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 35 Branches 179 Tags 1.7 GiB
9165ea9e67
Commit Graph

10097 Commits

Author SHA1 Message Date
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a Removed useless translation keys 2020-04-25 12:43:41 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php 2020-04-24 19:01:08 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
florian HENRY
a685026756 fix: remove php warning 2020-04-24 17:22:35 +02:00
Laurent Destailleur
b77892451f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552 FIX Situation invoice take into account the credit notes. 2020-04-24 15:57:08 +02:00
Laurent Destailleur
b2b580f6fb Report error 2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad Report error 2020-04-24 15:21:02 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-23 17:17:42 +02:00
stickler-ci
2633e90890 Fixing style errors. 2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice 
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
 2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a Fixing style errors. 2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice 
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
 2020-04-23 16:29:22 +02:00
Laurent Destailleur
3a9add0e70 FIX #13663 2020-04-23 13:37:43 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php 2020-04-22 19:16:58 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
cadb52c5b3 Look and feel v12 2020-04-20 19:39:34 +02:00
Laurent Destailleur
67a7d6b77d Look and feel v12 2020-04-20 15:57:15 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
98f370034a Look and feel v12 2020-04-20 14:53:17 +02:00
Laurent Destailleur
40b3db940c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-20 14:44:36 +02:00
Laurent Destailleur
b90217d860
Merge pull request #13655 from frederic34/patch-4 
fix indent
 2020-04-20 14:38:17 +02:00
Laurent Destailleur
78474af486 Link missing 2020-04-20 03:14:44 +02:00
Frédéric FRANCE
5992318af7
Update card.php 2020-04-19 21:49:37 +02:00
Frédéric FRANCE
61e76ef25e
Update api_bankaccounts.class.php 2020-04-19 21:47:30 +02:00
Laurent Destailleur
018cfdf54b FIX Field balance before and after sometimes not visible in bank entries 2020-04-18 16:14:37 +02:00
Laurent Destailleur
de74c447cc Fix sanitize amount 2020-04-18 16:05:26 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty 
NEW : Extend retained warranty to be  available for all invoices
 2020-04-18 15:32:33 +02:00
Laurent Destailleur
b0515c626b Look and feel v12 2020-04-18 00:09:24 +02:00
Laurent Destailleur
ee26390f89 Look and feel v12 2020-04-17 19:15:22 +02:00
Laurent Destailleur
6fd34f592d Fix default value 2020-04-17 19:07:30 +02:00
Laurent Destailleur
ea60d0be63 FIX #13618 2020-04-17 10:27:38 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
ptibogxiv
284f269213
Update api_bankaccounts.class.php 2020-04-15 19:32:45 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
ATM john
e6669348e1 Fix dom manipulation on creation 2020-04-15 11:09:34 +02:00
ATM john
4b4f69c76a fix indentation 2020-04-15 10:52:28 +02:00
stickler-ci
e6b29aa0f0 Fixing style errors. 2020-04-15 08:48:45 +00:00
ATM john
a9c9292137 Merge branch '12.0_new_extend_retained_warranty' of github.com:atm-john/dolibarr into 12.0_new_extend_retained_warranty 2020-04-15 10:45:53 +02:00
ATM john
9a1993f71c Fix retained warranty default value 2020-04-15 10:44:07 +02:00
stickler-ci
cbf6afb4a0 Fixing style errors. 2020-04-14 12:13:38 +00:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
Laurent Destailleur
a72b262f5b FIx #13592 
Conflicts:
	htdocs/compta/bank/line.php
 2020-04-13 14:52:06 +02:00
Laurent Destailleur
4ab3bf99ec FIx #13592 2020-04-13 14:50:55 +02:00
Laurent Destailleur
b54e3fb18c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-13 14:39:10 +02:00
Laurent Destailleur
f726fcdcd8 FIX #13593 2020-04-13 14:32:15 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
b6baba7651 Removed deprecated var 2020-04-12 18:59:22 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
4a6ffd2619
Merge pull request #13570 from frederic34/patch-6 
Add table_ref_field to facture-rec class
 2020-04-12 17:17:43 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:54:09 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Frédéric FRANCE
251f6d0cb1
Update facture-rec.class.php 2020-04-11 22:53:45 +02:00
Frédéric FRANCE
e9aa27d731
Update facture-rec.class.php 2020-04-11 21:06:33 +02:00
Laurent Destailleur
760121a3d1 Can sort list of answers. 2020-04-11 14:13:16 +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
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2 
add  in default search
 2020-04-10 12:12:28 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Anthony Berton
96f1c961b7
Update list.php 2020-04-10 10:55:14 +02:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard 
NEW Confirm file delete on fracture card
 2020-04-08 14:53:19 +02:00
Laurent Destailleur
efd6d14c1a
Merge pull request #13505 from atm-florian/develop 
fix php warning
 2020-04-08 14:40:59 +02:00
Laurent Destailleur
215c7b0e32 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/compta.lang
 2020-04-08 11:42:43 +02:00
Laurent Destailleur
146ead4d04 Code comment 2020-04-08 11:39:22 +02:00
Laurent Destailleur
df81065f73 MAIN_VIEW_LINE_NUMBER_IN_LIST 2020-04-08 11:23:31 +02:00
stickler-ci
0ce44251f7 Fixing style errors. 2020-04-08 08:50:16 +00:00
Tobias Sekan
23645b7865
Add confirm for delte file in facture 2020-04-08 10:30:51 +02:00
Laurent Destailleur
8e7ad726b2 NEW Easier way to setup the different types of tax. Better visibility. 
FIX edit of tax stamp regenerated the PDF.
 2020-04-07 14:06:08 +02:00
Laurent Destailleur
ff1b3db54b Fix regression on hamburger picto 2020-04-06 23:38:30 +02:00
florian HENRY
48da8c315f fix php warning 2020-04-06 12:21:20 +02:00
Laurent Destailleur
03b09f1d28 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 12:14:03 +02:00
Laurent Destailleur
13b47774e2 FIX #13424 2020-04-05 11:55:43 +02:00
Maxime Kohlhaas
fd5b2ba391 New supplier turnover by product service report 2020-04-04 23:29:45 +02:00
Maxime Kohlhaas
60bd0e49ec Fix missing token 2020-04-04 18:57:51 +02:00
Maxime Kohlhaas
fe876b96fe Fix links + getEntity 2020-04-04 18:49:30 +02:00
Maxime Kohlhaas
1adfe5c21f New supplier turnover by product service report 2020-04-04 15:45:32 +02:00
Maxime Kohlhaas
863f8dd1d6 New supplier turnover by thirdparty report 2020-04-04 15:38:22 +02:00
Maxime Kohlhaas
67f9b218c5 New supplier turnover report 2020-04-04 15:38:01 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
b8c2dd6025 Look and feel v12 2020-04-02 15:11:46 +02:00
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master 
NEW: Cash Control in TakePOS
 2020-04-02 12:51:36 +02:00
Laurent Destailleur
bb9a4324d1
Merge pull request #13471 from atm-florianm/NEW_add_author_column_on_invoice_list_and_supplier_invoice_list 
NEW: "author" column in the client/supplier invoice lists
 2020-04-02 12:40:51 +02:00
Laurent Destailleur
5d9d62f185
Merge pull request #13480 from atm-florian/develop 
fix: correct hook init invoice_rec list
 2020-04-02 12:38:32 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
florian HENRY
609de965b1 fix: hook init invoicerec list normalyse 2020-04-02 10:45:14 +02:00
stickler-ci
9476fbc3e7 Fixing style errors. 2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204 Fix ##13474: copy extrafields of LINES from a draft invoice to an 
invoice template
 2020-04-02 01:10:56 +02:00
Laurent Destailleur
70706d9ea7 FIX Missing token and take into account max date when it can. 2020-04-01 18:48:45 +02:00
Florian Mortgat
f52af23396 NEW: "author" column in the client/supplier invoice lists 2020-04-01 17:09:01 +02:00
ATM john
81adc6913e change conf usage 2020-04-01 12:12:30 +02:00
ATM john
79fe664365 fix merge not applied 2020-03-31 16:43:38 +02:00
stickler-ci
004d9381f5 Fixing style errors. 2020-03-31 14:36:42 +00:00
ATM john
c466beea3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-03-31 16:28:43 +02:00
jove@bisquerra.com
d9614ac6fc Integrate Cash Control in TakePOS 2020-03-30 20:05:45 +02:00
Laurent Destailleur
04a5929e91
Merge pull request #13431 from aspangaro/12.0_a25 
Typo
 2020-03-30 18:52:10 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Alexandre SPANGARO
e1611a8366 Typo 2020-03-27 06:16:24 +01:00
Laurent Destailleur
3ae3e9a16e Remove $_POST 2020-03-26 02:21:50 +01:00
Laurent Destailleur
d3debccabe FIX bad value in currency into discount created from down payment 2020-03-26 02:14:57 +01:00
Laurent Destailleur
d2163c95d6 Save the vat src code when converting down payment into discount 2020-03-26 02:13:34 +01:00
Laurent Destailleur
88d98acbba FIX #13410 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-26 01:26:50 +01:00
Laurent Destailleur
ba000dbcfd FIX #13410 2020-03-26 01:24:27 +01:00
Laurent Destailleur
2e5bfb207f Fix responsive 2020-03-25 23:50:05 +01:00
Alexandre SPANGARO
c3e5cf901d Work on split module fournisseur 2020-03-24 22:20:25 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
f4a52470e3 Graph use color of status 2020-03-23 19:46:43 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
222556b464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
	htdocs/core/lib/functions.lib.php
 2020-03-19 22:09:17 +01:00
Laurent Destailleur
87e808fec4 Fix phpcs 2020-03-19 22:07:20 +01:00
Laurent Destailleur
a413e2861e Fix edit html 2020-03-19 21:13:15 +01:00
Laurent Destailleur
d9f616d6e3 Avoid file xxx_preview-1.png into export 2020-03-19 15:59:49 +01:00
Laurent Destailleur
303961b0a6 Fix trans 2020-03-19 12:10:22 +01:00
Laurent Destailleur
8e1ffa5144 Fix management of token 2020-03-19 10:52:07 +01:00
Laurent Destailleur
c94c33696a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-19 09:58:04 +01:00
Laurent Destailleur
ea13c707a2
Merge pull request #13380 from atm-john/11.0_fix_import_lines_from_object_for_situation_invoices 
FIX import lines from object for situation invoices
 2020-03-18 19:25:04 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
 2020-03-18 18:50:55 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0 
FIX: Bank movements color is not showing
 2020-03-18 18:22:46 +01:00
ATM john
c767e553d3 fix import line from object default value for situations 2020-03-18 10:59:13 +01:00
ATM john
7b8cafb710 remove var_dump 2020-03-18 10:34:44 +01:00
ATM john
d3aeec0a7c Fix situation value transmission 2020-03-18 10:30:15 +01:00
Ferran Marcet
1fe4e4415e FIX: Bank movements color is not showing 2020-03-18 09:27:08 +01:00
ATM john
075757eb3d Fix situation value transmission 2020-03-17 16:49:05 +01:00
Laurent Destailleur
9525289488 Fix return code of some API 2020-03-17 13:50:20 +01:00
ATM john
cb43928a5d Fix radio label target 2020-03-17 12:29:14 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
621c4ff4e7 Fix phpcs 2020-03-15 19:52:46 +01:00
Laurent Destailleur
22e8fdb46b Enhance #13033 2020-03-15 13:57:31 +01:00
stickler-ci
1a97e7283f Fixing style errors. 2020-03-15 12:09:52 +01:00
andreubisquerra
d7150fb592 Change cash control procedure 2020-03-15 12:09:52 +01:00
Laurent Destailleur
8192e9dc67 FIX Missing token in form 2020-03-14 03:02:49 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules 
NEW add numbering module for cash desk
 2020-03-13 16:58:27 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
VESSILLER
1379b2ce87 FIX travis errors 2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Laurent Destailleur
967d4223c6 FIX #13277 2020-03-12 16:15:48 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink 
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
 2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink 2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5 NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type 2020-03-12 09:44:43 +01:00
Laurent Destailleur
a9847f0d40
Merge pull request #13308 from TobiasSekan/NewCategoryFilterForBankList 
NEW category filter for bank list
 2020-03-11 16:50:12 +01:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Laurent Destailleur
e66313d47e FIX use bad var to check if total is positive for each VAT rate when 
validating invoice.
 2020-03-09 20:06:47 +01:00
Laurent Destailleur
82f0d8a3bc Fix bad params 2020-03-09 17:38:47 +01:00
Tobias Sekan
9dd362a22c
NEW Category filter on bank list 2020-03-09 11:43:15 +01:00
Laurent Destailleur
3edc3dd382 Fix fields definition 2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d Fix table fields 2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472 Fix graph of product distribution when too much record 2020-03-06 12:45:02 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201 FIX #13263 2020-03-04 00:53:07 +01:00
Laurent Destailleur
71f19b4e5e FIX #13267 2020-03-04 00:38:04 +01:00
Laurent Destailleur
70d4e5d7e3 Fix button should not be visible 2020-03-03 23:51:17 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency 
NEW: add multicurrency columns to document lists
 2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312 
FIX doc
 2020-03-03 22:53:51 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20 
FIX: Nowrap on amount
 2020-03-03 21:44:54 +01:00
ptibogxiv
a71356f0ed
FIX doc 2020-03-03 13:41:19 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Alexandre SPANGARO
aeb3f70df7 FIX: Nowrap on amount 2020-03-03 07:26:51 +01:00
Laurent Destailleur
46bf65704a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
 2020-03-02 21:59:34 +01:00
Laurent Destailleur
c9d7ea8998
Merge pull request #13241 from ptibogxiv/patch-309 
NEW: api invoice get by ref
 2020-03-02 21:39:17 +01:00
Laurent Destailleur
c8b51066e5 NEW Add due date in feature "Export accounting documents" 2020-03-02 16:00:07 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php 2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php 2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6 Fixing style errors. 2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref 2020-03-01 18:33:13 +01:00
Alexandre SPANGARO
da99c89c26 FIX: typo on ckeck method 2020-03-01 05:21:51 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16 
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
 2020-02-29 13:02:43 +01:00
Laurent Destailleur
f0d458682d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 00:15:17 +01:00
Laurent Destailleur
f5a07dfb7e Add status into popup 2020-02-28 18:57:17 +01:00
Laurent Destailleur
87b3cf9765 FIX Bad link to template invoices 2020-02-28 12:01:43 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Marc de Lima Lucio
5d1f91f8ac FIX: muticurrency columns: remove useless column totals that mix currencies together 2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
6d728f12ba NEW: invoice list: enable multicurrency columns 2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/index.php
 2020-02-26 17:02:23 +01:00
Laurent Destailleur
921dacf695 Fix remove $_POST 2020-02-26 16:58:45 +01:00
Laurent Destailleur
114e41108d FIX sort link 2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46 FIX Bad sort link in accounting report 2020-02-26 06:43:52 +01:00
Laurent Destailleur
4831d22354 FIX sort link 2020-02-26 06:43:21 +01:00
Laurent Destailleur
6cf6719cfb FIX Bad sort link in accounting report 2020-02-26 06:39:02 +01:00
ATM john
4865e34cc2 fix missing visibility 2020-02-25 23:02:13 +01:00
Laurent Destailleur
a18fda6b3d Fix data on popup 2020-02-25 19:59:53 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Laurent Destailleur
6366881f91 FIX #13175 2020-02-24 00:41:25 +01:00
ATM john
13790422dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-24 00:18:37 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of 
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
 2020-02-23 22:49:03 +01:00
Laurent Destailleur
189c0d675b Fix memory report. Xdebug no more required. Try = null instead of unset. 2020-02-23 22:05:59 +01:00
Laurent Destailleur
0d474b2ec9 CSS 2020-02-22 14:20:42 +01:00
Laurent Destailleur
1d34ef213c Fix error management 2020-02-22 12:19:46 +01:00
ATM john
4117aa56a2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-22 11:19:49 +01:00
Frédéric FRANCE
8d507c4f32 fix workflow with multicurrency 2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7 
fix workflow with multicurrency
 2020-02-21 18:12:27 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
89b7c8dfd6 NEW Can select which element to export in export accounting documents. 2020-02-21 14:20:05 +01:00
VESSILLER
ec19b2feef FIX phpcs nestling too high level 2020-02-21 12:00:16 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency 2020-02-20 15:11:31 +01:00
Laurent Destailleur
52c7f908a0 Doxygen 2020-02-20 14:02:27 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
e73d83767c Fix phpcs 2020-02-20 12:35:48 +01:00
Laurent Destailleur
7796724d63
Update list.php 2020-02-20 01:07:41 +01:00
Laurent Destailleur
960302c012
Merge branch 'develop' into patch-35 2020-02-20 01:07:08 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
44c2909696 FIX Multicompany compatibility 2020-02-19 16:08:33 +01:00
Laurent Destailleur
3fafbb372b Remove call of $mc->dao than hangs. Replaced with $mc use. 2020-02-19 15:51:27 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
stickler-ci
028566616d Fixing style errors. 2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4 extend retained warranty to be available for all invoices 2020-02-19 11:54:55 +01:00
Pierre Ardoin
bebc37abe3
Update list.php 2020-02-19 08:54:10 +01:00
Pierre Ardoin
34d7fb887f
Show project Ref support if enable 
Add search and Project Ref column in the list, only if project module is enable.
 2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a FIX #13118 2020-02-19 03:37:28 +01:00
Laurent Destailleur
43b173ef76 FIX #13131 2020-02-19 01:23:54 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Laurent Destailleur
c196342fd8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07 Fix phpcs 2020-02-13 15:43:53 +01:00
Laurent Destailleur
306b8d190f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a Fix phpcs 2020-02-13 15:42:41 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Marc de Lima Lucio
fa78af1996 Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0 2020-02-13 12:18:16 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
e511deb8e7 FIX #13096 2020-02-13 11:39:08 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
Laurent Destailleur
75774ec6c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Marc de Lima Lucio
b1b00450a9 FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one 2020-02-12 12:10:48 +01:00
Marc de Lima Lucio
de8660fb55 FIX: situation invoice: allow excess paid to be converted to discount 2020-02-12 12:09:03 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
stickler-ci
416cb3016d Fixing style errors. 2020-02-11 13:15:23 +00:00
oscim
8b67793409
report and apply GETPOST method 
report and apply GETPOST method  for $dateech, $dateperiod, $label
 2020-02-11 14:13:08 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
5f507b2df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php 
Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 15:12:55 +01:00
Laurent Destailleur
10790420ba
Merge pull request #13051 from oscim/patch-19 
report and apply  GETPOST method for $datev and $datep
 2020-02-08 15:07:18 +01:00
Laurent Destailleur
544e05a7dd
Update card.php 2020-02-08 15:06:45 +01:00
Laurent Destailleur
9f9002d6a6 Update field definition 2020-02-07 16:05:04 +01:00
Laurent Destailleur
fe7b79c83c Fix definition of objects 2020-02-07 15:51:14 +01:00
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
oscim
e408ea463c
report and apply GETPOST method for $datev and $datep 
fix for usage GETPOST() for input  $datev and $datep
And report definition $datev and $datep in top ection file for support GET params for action create
 2020-02-07 09:31:58 +01:00
Laurent Destailleur
9c73bb1aef NEW Can create an deposit from order using a percentage of qty. 2020-02-06 14:15:41 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:09 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
af7a5b510d Fix phpcs 2020-02-04 14:47:30 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
a30da7860f FIX #12892 2020-02-03 03:32:31 +01:00
Laurent Destailleur
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +01:00
Laurent Destailleur
d827e3289a Removed no more used field "amount" in llx_facture 2020-01-31 15:12:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Michael Jeanmotte
f1f83656f1 Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259 2020-01-29 22:54:35 +01:00
Laurent Destailleur
e796a2eda9 Add fields array on common objects 2020-01-29 22:38:14 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
oscim
d224c711cf Update result.php 
fix error for display detail of account 6xxx. this account is < 0, but is not null
 2020-01-29 11:07:30 +01:00
oscim
862da5b646
Update result.php 
fix error for display detail of account 6xxx. this account is < 0, but is not null
 2020-01-29 08:08:15 +01:00
Laurent Destailleur
9acda3545e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:51:32 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices 
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
 2020-01-27 09:49:49 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php
 2020-01-27 01:50:02 +01:00
Laurent Destailleur
cf6b9f7d03
Merge pull request #12918 from atm-florian/11_fixWithdrwLineList 
fix SEPA lines with limit select and working pagination
 2020-01-26 22:25:01 +01:00
Laurent Destailleur
14f1f98b59
Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination 
10 fix create sepa limit and pagination
 2020-01-26 22:24:11 +01:00
Pierre Ardoin
c64acb1a9c
Permissions Issue 
fixes an issue that displayed the "restricted area" banner despite user permissions.
 2020-01-25 15:19:46 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00