dolibarr

Author	SHA1	Message	Date
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	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +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	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	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	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	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
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	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
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
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +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
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	d662bb97dc	Debug parallel sale feature	2020-03-23 15:02:15 +01:00
Laurent Destailleur	303961b0a6	Fix trans	2020-03-19 12:10:22 +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
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
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	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	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
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	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
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	f0d458682d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-29 00:15:17 +01:00
Laurent Destailleur	87b3cf9765	FIX Bad link to template invoices	2020-02-28 12:01:43 +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
ATM john	4865e34cc2	fix missing visibility	2020-02-25 23:02:13 +01:00
Laurent Destailleur	457d0668c8	Look and feel v12	2020-02-24 05:23:34 +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
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
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	44eda2d4ad	Fix doxygen	2020-02-20 13:42:43 +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
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
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	bb895cb1d8	FIX ref_client not visible in tooltip.	2020-02-13 18:00:59 +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	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
Laurent Destailleur	f70dd8ec06	Clean code. Load thirdparty for correct lang before generating doc	2020-02-10 00:22:53 +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
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	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	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	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
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	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	09f809f347	FIX #12913	2020-01-25 14:03:24 +01:00
Laurent Destailleur	540713510e	Fix load of segment prices not required for virtual stock change virtual stock must include production (WIP)	2020-01-23 21:03:15 +01:00
Laurent Destailleur	12b4909c45	Fix load of segment prices not required for virtual stock change virtual stock must include production (WIP)	2020-01-23 20:59:18 +01:00
Laurent Destailleur	d3411a79ef	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:11:44 +01:00
Laurent Destailleur	4686be34d2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/stripe/charge.php	2020-01-22 14:10:46 +01:00
Laurent Destailleur	2d07a08e55	Fix init of specimen	2020-01-21 00:22:57 +01:00
Laurent Destailleur	80483fc085	Fix init of specimen	2020-01-21 00:20:03 +01:00
Laurent Destailleur	92856788a3	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-20 18:39:46 +01:00
Laurent Destailleur	5f64531e9b	Fix look and feel v11	2020-01-20 12:39:25 +01:00
Laurent Destailleur	526ae83e8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-19 19:49:16 +01:00
Laurent Destailleur	e679e05f57	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-19 19:49:04 +01:00
Pierre Ardoin	e4eb8883fe	Fix double display of create credit note button Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated. After: Displays a single button "Create a credit note"	2020-01-19 19:10:10 +01:00
Laurent Destailleur	8c8d492a48	FIX Protection to avoid blocking situation with negative lines	2020-01-19 15:19:07 +01:00
Laurent Destailleur	6fd717539d	Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2020-01-18 20:21:29 +01:00
Laurent Destailleur	24d439845b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-18 20:20:25 +01:00
Scrutinizer Auto-Fixer	8744f6ab7b	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-18 15:17:07 +00:00
Laurent Destailleur	82deccea08	Fix bad link	2020-01-17 14:41:42 +01:00
Laurent Destailleur	c556f60c89	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-16 18:13:35 +01:00
Laurent Destailleur	849c78f4cd	Doc	2020-01-16 10:12:39 +01:00
Laurent Destailleur	ad7278e6a5	FIX Label of DEPOSIT on screen Fix look and feel v11	2020-01-16 02:48:24 +01:00
Laurent Destailleur	76aedc9264	Merge pull request #12365 from aspangaro/11.0_a2 NEW Invoice list - Add date start & date end	2020-01-15 20:50:20 +01:00
Laurent Destailleur	d97a59ac4a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: ChangeLog htdocs/comm/remise.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/variants/combinations.php	2020-01-10 14:25:26 +01:00
atm-arnaud	ae4554af65	FIX drafts are now implemented for stats	2020-01-08 11:27:52 +01:00
Laurent Destailleur	ec2ea612ae	Fix GETPOST	2020-01-06 17:19:49 +01:00
Laurent Destailleur	2c20b25a29	Suggest another value than "bad customer" to close an invoice paid	2020-01-02 18:02:53 +01:00
Laurent Destailleur	2e8fd25299	FIX Local taxes was not correctly supported in TakePOS.	2020-01-01 21:54:47 +01:00
Laurent Destailleur	b50cb2a65d	Fix solution to solve a blocking situation (credit note both refunded and consumed)	2020-01-01 19:04:14 +01:00
Alexandre SPANGARO	384651db46	Merge remote-tracking branch 'upstream/develop' into 11.0_a2	2019-12-23 21:01:17 +01:00
Laurent Destailleur	9a08a6bf6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/categories/traduction.php htdocs/compta/facture/class/facture.class.php htdocs/contact/card.php htdocs/core/modules/modSociete.class.php htdocs/fourn/class/fournisseur.product.class.php htdocs/langs/en_US/products.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php htdocs/margin/tabs/thirdpartyMargins.php	2019-12-23 14:13:26 +01:00
VESSILLER	c39e45b81a	FIX set due date in object in create invoice	2019-12-23 10:57:51 +01:00
Laurent Destailleur	dd9f25b13a	CSS	2019-12-22 16:33:15 +01:00
Laurent Destailleur	39737c7c4b	Fix opacity on text with a href links inside Fix var not defined	2019-12-22 13:19:14 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Laurent Destailleur	138215fc3f	Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non european users.	2019-12-16 22:30:16 +01:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Laurent Destailleur	49a8b4544e	Fix look and feel v11	2019-12-15 19:32:37 +01:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	c98ab917dd	doxygen	2019-12-11 20:33:58 +01:00
Laurent Destailleur	a77dc75bd4	Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template	2019-12-09 16:05:23 +01:00
Laurent Destailleur	f28e4c14e8	FIX #12644	2019-12-09 13:40:26 +01:00
Florian Mortgat	6227d14cf3	NEW 10.0: link to template of origin in bill cards for bills created from a template	2019-12-06 13:48:24 +01:00
Laurent Destailleur	93d66d8213	Debug v11	2019-12-06 08:50:26 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Laurent Destailleur	3eec2430eb	Merge pull request #12585 from atm-john/develop_factoring_token_usage Factoring token usage	2019-12-01 11:37:30 +01:00
Laurent Destailleur	790fdc881c	# WARNING: head commit changed in the meantime Restore file for travis	2019-12-01 10:50:56 +01:00
Laurent Destailleur	6bf3af5d83	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 Conflicts: htdocs/compta/tva/index.php htdocs/core/lib/pdf.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/tpl/objectline_view.tpl.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php	2019-12-01 10:30:22 +01:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +01:00
Laurent Destailleur	1d564c2a39	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 Conflicts: htdocs/core/class/notify.class.php	2019-12-01 00:58:01 +01:00
Maxime Kohlhaas	558669dd88	Fix #6497 : deposit lines were not translated	2019-11-30 16:14:16 +01:00
Frédéric FRANCE	06839e9a7f	functions return void	2019-11-28 22:34:53 +01:00
Scrutinizer Auto-Fixer	e36ee63ab6	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-22 13:16:38 +00:00
Laurent Destailleur	fb70893229	Fix missing class reposition	2019-11-19 21:29:49 +01:00
Laurent Destailleur	07c01a821e	FIx #12466 manually (conflict pb)	2019-11-19 19:43:02 +01:00
Laurent Destailleur	5d7a1f1265	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang	2019-11-19 19:02:14 +01:00
Laurent Destailleur	2f3b4d239b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-11-19 18:56:12 +01:00
Laurent Destailleur	5b6f0cb101	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/extrafields.class.php	2019-11-18 21:19:10 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. Fix remove empty id	2019-11-16 14:38:05 +01:00
gauthier	a5635825f3	FIX : wrong invoice id for fetchObjetctLinked	2019-11-14 12:09:32 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Laurent Destailleur	3430a88c72	Fix $conf not defined	2019-11-12 10:13:22 +01:00
Laurent Destailleur	c02cd80b75	Clean code	2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer	df664e790b	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 23:15:34 +00:00
Alexandre SPANGARO	86b90b115f	NEW Invoice list - Add date start & date end	2019-11-09 05:20:13 +01:00
Scrutinizer Auto-Fixer	2ecfe41810	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 09:53:31 +00:00
Laurent Destailleur	c7e261a973	FIX #11907	2019-11-07 14:40:26 +01:00
Alexandre SPANGARO	e60b7a67fa	NEW Invoice list - Add date start & date end	2019-11-07 06:35:58 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
Laurent Destailleur	17d5c385ff	FIX #12320 It is clearer that you can't change thirdparty when creating invoice from template with a recurring rule.	2019-11-05 15:46:48 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Frédéric FRANCE	ac783b303d	Update card-rec.php	2019-11-04 20:47:25 +01:00
Laurent Destailleur	e60fff39d9	Fix phpcs	2019-11-04 20:36:55 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
Laurent Destailleur	99a4781a42	Fix better support for multicurrency for template invoices	2019-11-03 18:58:26 +01:00
Laurent Destailleur	630a150b09	Fix multicurrency rate must be visible if currency differs only	2019-11-03 17:48:16 +01:00
Laurent Destailleur	89f1904793	Finish removing of ->attribute_label	2019-11-02 17:26:26 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	a1700e71be	Fix phpcs	2019-10-31 21:18:38 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	a1f0245c79	clean indent in compta, contact directory	2019-10-26 18:13:20 +02:00
Alfredo Altamirano	f2e5a23547	Declaration of $soc should not be conditional	2019-10-20 13:47:39 -05:00
Laurent Destailleur	5a4960f7ae	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/takepos/takepos.php	2019-10-20 15:30:28 +02:00
Frédéric FRANCE	a16b7bcda6	cut long lines	2019-10-19 19:16:28 +02:00
Laurent Destailleur	f85899742b	Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-17 17:48:42 +02:00
Laurent Destailleur	f7782873a5	Look and feel v11	2019-10-17 15:58:24 +02:00
Laurent Destailleur	c58a006703	NEW Show POS application and terminal on invoice card.	2019-10-17 15:56:50 +02:00
Laurent Destailleur	5e12dcc6b1	Fix on FACTURE_ENABLE_NEGATIVE	2019-10-17 15:40:02 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	b9ec45fd49	Clean code	2019-10-16 14:02:13 +02:00
Laurent Destailleur	5d02763288	Merge pull request #12129 from cyrilus/develop ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning	2019-10-14 20:39:08 +02:00
stickler-ci	4b7987374b	Fixing style errors.	2019-10-14 14:46:04 +00:00
Laurent Destailleur	dba9450b01	css	2019-10-14 16:03:12 +02:00
Laurent Destailleur	28339920b3	Translation	2019-10-14 16:00:03 +02:00
Laurent Destailleur	323f31d832	Trans frequency	2019-10-13 20:54:00 +02:00
Laurent Destailleur	f91b98d326	Add frequency in template invoice popup	2019-10-13 20:50:03 +02:00
Frédéric FRANCE	9f59656589	fix typo inspired by grandoc	2019-10-11 23:08:33 +02:00
Laurent Destailleur	78bfc8997d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/link.class.php	2019-10-11 16:14:29 +02:00
Laurent Destailleur	d052e4f323	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/link.class.php	2019-10-11 16:13:26 +02:00
Laurent Destailleur	fc9c343af9	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/class/link.class.php	2019-10-11 16:12:01 +02:00
Laurent Destailleur	777c297353	FIX #12054	2019-10-11 15:42:27 +02:00
ro@t.com	2149b155d1	ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning	2019-10-10 15:57:26 +02:00
Laurent Destailleur	b34cbfad74	Rename const	2019-10-10 15:23:45 +02:00
Laurent Destailleur	015d51c169	NEW Add column of module source and POS terminal in invoice list.	2019-10-10 15:10:41 +02:00
Laurent Destailleur	b6c600c171	css	2019-10-10 11:44:03 +02:00
Frédéric FRANCE	0c8331b6d7	doxygen	2019-10-09 18:47:25 +02:00
Laurent Destailleur	dcc4fa6a64	Merge branch 'develop' into patch-255	2019-10-08 19:37:42 +02:00
Laurent Destailleur	43a70e5548	Clean code to use the new $extrafields->attributes array	2019-10-08 09:28:50 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Laurent Destailleur	b883a8092a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php htdocs/core/lib/product.lib.php htdocs/core/tpl/extrafields_list_search_input.tpl.php htdocs/fourn/facture/card.php htdocs/product/class/html.formproduct.class.php	2019-10-05 19:35:40 +02:00
Laurent Destailleur	0b9d27423d	FIX Can't modify vendor invoice if transfered into accountancy	2019-10-04 10:31:57 +02:00
Laurent Destailleur	6cd3d27885	Fix comparison	2019-10-04 09:54:52 +02:00
Laurent Destailleur	1a66e0b05e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/product/card.php	2019-10-03 17:53:59 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Laurent Destailleur	b79831ec39	Merge pull request #11952 from aspangaro/11.0_https Move Gnu.org to https	2019-10-01 14:48:21 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Frédéric FRANCE	3ba48fde93	Update api_invoices.class.php	2019-09-30 21:44:37 +02:00
Laurent Destailleur	2da5a506a9	Update facture.class.php	2019-09-30 18:25:03 +02:00
Laurent Destailleur	564e22009d	Update facture.class.php	2019-09-30 18:22:37 +02:00
Laurent Destailleur	945dd0ae89	Update card.php	2019-09-30 18:12:43 +02:00
ptibogxiv	4177c72ae0	Update facture.class.php	2019-09-29 15:46:28 +02:00
ptibogxiv	2e8b99606e	Update facture.class.php	2019-09-29 15:45:41 +02:00
ptibogxiv	5a096972c0	Update list.php	2019-09-29 15:42:39 +02:00
Laurent Destailleur	6966651d51	Standardize code to use dolSqlDateFilter	2019-09-28 13:22:05 +02:00
Laurent Destailleur	07b555b965	Merge branch 'develop' into patch-255	2019-09-27 15:23:15 +02:00
Laurent Destailleur	f5c839217a	Merge pull request #11914 from fmarcet/develop Fix: Load invoices only if showed	2019-09-27 14:34:16 +02:00
Ferran Marcet	a8cc11d232	Merge branch 'developup' into develop	2019-09-24 13:38:11 +02:00
Alexandre SPANGARO	1b099733f5	Merge remote-tracking branch 'upstream/develop' into 11.0_translation	2019-09-24 08:42:57 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	1c13a38ce9	Typo abscissa	2019-09-23 21:45:23 +02:00
Alexandre SPANGARO	e32772fdc5	Translate	2019-09-20 09:44:49 +02:00
Laurent Destailleur	a43253eab8	Fix for deposit not correctly closed	2019-09-17 18:49:56 +02:00
Ferran Marcet	3f25a8d8d5	New: Load invoices only if showed	2019-09-17 09:38:08 +02:00
Ferran Marcet	e4984492b3	Dejarlo igual que develop	2019-09-17 09:32:43 +02:00
Ferran Marcet	c48fc3a2cf	Merge branch 'developup' into develop # Conflicts: # htdocs/compta/facture/fiche-rec.php # htdocs/install/mysql/migration/9.0.0-10.0.0.sql	2019-09-17 09:27:42 +02:00
Christophe Battarel	c8cb5886f4	correction	2019-09-10 17:04:09 +02:00
Christophe Battarel	95417d4c86	allow standalone credit note even if no invoice	2019-09-10 16:24:04 +02:00
ptibogxiv	5d81b0271d	Update facture.class.php	2019-09-06 11:40:26 +02:00
ptibogxiv	fc75d72290	Update list.php	2019-09-06 11:35:52 +02:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Laurent Destailleur	28c4f86c79	Fix regression	2019-09-03 16:23:39 +02:00
Laurent Destailleur	33cb9f7df4	Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid FIX set due date in object in create invoice and set default paid in …	2019-09-03 15:21:19 +02:00
Frédéric FRANCE	32343fba24	Optimize invoice situation doc with many many lines, it can be very very long to generate pdf	2019-09-03 13:43:44 +02:00
Laurent Destailleur	98459363df	Merge pull request #11795 from jtraulle/fix-doxygen-examples Fix Wrongly catched examples by Doxygen	2019-09-03 12:45:23 +02:00
Laurent Destailleur	a269082d70	Replace deprecated code with new one	2019-09-02 03:58:00 +02:00
Jean Traullé	c32c7d48ba	Fix Wrongly catched examples by Doxygen	2019-08-30 17:14:59 +02:00
Laurent Destailleur	05c9e97fe4	The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.	2019-08-29 00:45:02 +02:00
VESSILLER	877867a6c2	FIX set due date in object in create invoice and set default paid in update invoice	2019-08-28 13:50:39 +02:00
Laurent Destailleur	999db7ed41	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php	2019-08-26 16:49:25 +02:00
ptibogxiv	7112fcee9a	Update list.php	2019-08-24 15:54:14 +02:00
ptibogxiv	2be125e647	Fix display context for takepos in invoice list fix for thirdparty name and create button	2019-08-24 15:47:17 +02:00
Laurent Destailleur	54203dda1f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/modules.php	2019-08-21 16:25:48 +02:00
Laurent Destailleur	def0311f9d	Fix translation	2019-08-19 17:26:13 +02:00
Laurent Destailleur	5351d78a96	Merge branch 'develop' into develop_new_dashboard	2019-08-18 01:26:56 +02:00
Regis Houssin	7c8b3c9a38	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-08-13 07:34:02 +02:00
Laurent Destailleur	14fabeb377	Variable rangtouse -> ranktouse	2019-08-10 00:46:20 +02:00
John Botella	b4c4e5a662	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard	2019-08-02 14:52:01 +02:00
Laurent Destailleur	d7a41c6b72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-08-01 12:54:27 +02:00
John Botella	9b84987cc1	prepare new dashboard	2019-08-01 12:33:19 +02:00
Laurent Destailleur	5eb8f05061	FIX #11584	2019-08-01 12:23:02 +02:00
Regis Houssin	d9ea61e47c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu Conflicts: htdocs/commande/class/commande.class.php	2019-07-31 12:49:56 +02:00
Laurent Destailleur	a7390e7e47	Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop NEW Management of retained warranty on situation invoices	2019-07-30 21:53:09 +02:00
Laurent Destailleur	11e3aa5860	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 11:07:11 +02:00
Laurent Destailleur	7931f0b422	Fix sql error	2019-07-29 11:06:39 +02:00
Laurent Destailleur	a5e3adc6f1	Fix travis	2019-07-29 10:51:17 +02:00
Laurent Destailleur	db461792a0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 01:36:35 +02:00
Laurent Destailleur	9a7113f4f5	FIX Update the file index table when we validate/rename a ref.	2019-07-28 22:26:55 +02:00
Laurent Destailleur	d6d1b29257	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-21 16:15:32 +02:00
Laurent Destailleur	4f34a8b6e8	FIX Position was lost when we edit the line of template invoice	2019-07-21 16:15:13 +02:00
Laurent Destailleur	865ebb9de2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2019-07-20 13:29:10 +02:00
Laurent Destailleur	e5c3945ec3	FIX delete of links between objects	2019-07-19 18:10:45 +02:00
Laurent Destailleur	f745d01bf3	Prepare change of properties "titre" into "title"	2019-07-19 13:22:54 +02:00
Regis Houssin	cbda42d146	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-07-19 09:37:34 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	3cffd70ed3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php	2019-07-18 18:09:37 +02:00
Laurent Destailleur	e548872133	Update prelevement.php	2019-07-18 17:23:05 +02:00
atm-ph	c961a397c4	Fix missing hook then can't interact with actions	2019-07-18 15:40:50 +02:00
Laurent Destailleur	adfbd62f8b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-14 00:44:35 +02:00
Laurent Destailleur	e0095871aa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/compta/stats/byratecountry.php htdocs/core/class/html.form.class.php	2019-07-14 00:19:56 +02:00
Laurent Destailleur	b66ad24d85	Fix save of doc template for recuring invoices.	2019-07-14 00:10:15 +02:00
Laurent Destailleur	f5cc29417d	Translation lignes -> lines	2019-07-05 21:50:35 +02:00
ATM-Nicolas	3d076d8bf9	FIX : We must save code instead of value in database for template invoice modelpdf	2019-07-05 11:16:12 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	69e0353e12	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-04 12:26:26 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
Laurent Destailleur	ee0a65e7fa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/action/card.php	2019-07-04 12:22:40 +02:00
Laurent Destailleur	bc309ace38	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-07-04 12:21:16 +02:00
Alexandre SPANGARO	ab7cb7bb2e	FIX Nowrap on amount	2019-07-02 12:01:50 +02:00
Maxime Kohlhaas	6b43c325c7	Fix wrong column for filters on invoice template list	2019-07-02 10:53:47 +02:00
John Botella	9c2e83dcae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-07-01 09:51:26 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
John Botella	75b55ac5d6	fix travis recommendations	2019-06-28 16:10:41 +02:00
Laurent Destailleur	c0ba22fc6c	Merge pull request #11406 from ptibogxiv/patch-194 NEW Can load multilang translation in same step than fetch_lines	2019-06-28 14:04:06 +02:00
Laurent Destailleur	6136dd6e7c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-27 13:57:08 +02:00
Laurent Destailleur	8c6485fa20	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: ChangeLog htdocs/compta/facture/card.php	2019-06-27 13:56:33 +02:00
Laurent Destailleur	d69b20311b	FIX If the replacement invoice has been deleted we can reopen	2019-06-27 01:13:46 +02:00
Laurent Destailleur	be695a8e1a	Fix link for situations	2019-06-27 00:51:03 +02:00
John Botella	ee98f3e6d7	fix travis recommendations	2019-06-26 10:48:22 +02:00
John Botella	7e14a598e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-26 09:43:43 +02:00
ptibogxiv	c81ffcd8f0	Update facture.class.php	2019-06-25 18:14:56 +02:00
ptibogxiv	66eec4da52	Update facture.class.php	2019-06-25 15:46:12 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	d810e11c4e	Update fiche-rec.php	2019-06-24 19:23:32 +02:00
John Botella	ec7446762c	Fix travis	2019-06-24 14:36:06 +02:00
Laurent Destailleur	1daac232b0	Code comment	2019-06-24 14:31:58 +02:00
John Botella	a83e7f3665	Add retained warranty to PDF	2019-06-24 12:00:55 +02:00
John Botella	7b6925b8f7	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-24 10:29:43 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
Laurent Destailleur	4f9aa4caac	Fix phpcs	2019-06-20 13:53:31 +02:00
Laurent Destailleur	d15a300f02	Removed not used var	2019-06-20 04:10:58 +02:00
Laurent Destailleur	daa8b43732	css	2019-06-19 15:51:48 +02:00
Laurent Destailleur	a11c816a17	Fix tooltip	2019-06-19 14:24:48 +02:00
Laurent Destailleur	2e1eb29ca0	Fix rendering of amount	2019-06-18 17:43:08 +02:00
Laurent Destailleur	a74eaaff4d	Fix sort of linked elements	2019-06-17 15:54:54 +02:00
Regis Houssin	6597c9f60d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-17 06:45:08 +02:00
Laurent Destailleur	49646663a1	Fix link on invoice	2019-06-07 22:47:15 +02:00
Laurent Destailleur	e3812e3b0c	FIX source template invoice not loaded/shown	2019-06-05 08:20:10 +02:00
Laurent Destailleur	4a63c6d38a	Fix phpcs	2019-06-04 19:20:08 +02:00
Laurent Destailleur	21a1e0d7b3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php	2019-06-04 19:03:27 +02:00
John BOTELLA	d7a393bbd3	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-04 14:00:18 +02:00
Laurent Destailleur	969e139d5c	Fix parameters of accessforbidden	2019-06-04 12:21:27 +02:00
Regis Houssin	fc83585574	FIX use setEntity() to move code in multicompany module	2019-06-03 11:37:04 +02:00
Regis Houssin	7b8b1a9052	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-03 11:04:28 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Laurent Destailleur	4bbef9b478	Update card.php	2019-06-02 12:29:05 +02:00
Laurent Destailleur	7020e1ef29	Update card.php	2019-06-02 12:27:32 +02:00
Maxime Kohlhaas	916d3ce931	Fix : only invoice active lines of a contract	2019-06-02 11:00:58 +02:00
Frédéric FRANCE	6bb1a4a0e6	Update linkedobjectblock.tpl.php	2019-05-29 11:26:04 +02:00
Frédéric FRANCE	c5c7e8d451	Update linkedobjectblock.tpl.php	2019-05-29 11:18:01 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Laurent Destailleur	848b8f9bc4	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/cron/cron_run_jobs.php htdocs/public/payment/newpayment.php scripts/cron/cron_run_jobs.php	2019-05-27 19:01:28 +02:00
Laurent Destailleur	71da27f333	Add error message	2019-05-27 16:40:06 +02:00
Laurent Destailleur	19ff0120ff	# WARNING: head commit changed in the meantime Removed uselesss files (replaced by DebugBar)	2019-05-26 11:42:00 +02:00
Laurent Destailleur	a40e5ca66c	Fix phpcs	2019-05-26 11:36:16 +02:00
Laurent Destailleur	ccfb4f575b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formfile.class.php	2019-05-24 15:00:14 +02:00
Laurent Destailleur	89455672a2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2019-05-24 14:58:21 +02:00
Marc de Lima Lucio	54f8c98b27	FIX: remove isolated transaction commit	2019-05-22 11:12:02 +02:00
Marc de Lima Lucio	66dd7e30ae	FIX: situation invoices: block progress percentage change for discount lines	2019-05-22 10:46:38 +02:00
Regis Houssin	4f2f23f522	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-22 08:45:31 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Laurent Destailleur	6365c7cd00	Bad cut and paste	2019-05-21 12:17:07 +02:00
Regis Houssin	2cf630c213	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-20 16:10:47 +02:00
Laurent Destailleur	321544b3fa	Fix phpcs	2019-05-20 15:25:39 +02:00
Laurent Destailleur	c3732f2b7a	Fix edition of margins in recurring invoices	2019-05-20 14:41:47 +02:00
Laurent Destailleur	83c369cc0f	Add $array_to_check for property in invoice instead of thirdparty	2019-05-20 13:02:33 +02:00
Laurent Destailleur	91dd8a71d3	Fix syntax error	2019-05-20 12:50:00 +02:00
Laurent Destailleur	827a2e1809	Fix test if qualified for stock change at wrong place	2019-05-20 12:47:02 +02:00
Laurent Destailleur	2bbb04085e	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/modulebuilder/template/class/myobject.class.php	2019-05-19 02:15:01 +02:00
Laurent Destailleur	71ef8c881b	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 Conflicts: htdocs/modulebuilder/template/class/myobject.class.php	2019-05-19 02:06:20 +02:00
Laurent Destailleur	2fd3eb8bdf	Update facture.class.php	2019-05-19 01:58:01 +02:00
ATM-Marc	83c38570e9	FIX: invoice class: bad SQL request if product type not set	2019-05-19 01:01:21 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
Laurent Destailleur	26d4875f8f	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop	2019-05-18 02:27:23 +02:00
Laurent Destailleur	68118e55dc	Update api_invoices.class.php	2019-05-18 00:58:43 +02:00
Maxime Kohlhaas	1af69d4c8f	Fix varnames in invoice api	2019-05-18 00:40:29 +02:00
Laurent Destailleur	c1ec7454a1	Merge branch 'develop' into clean_10_beta	2019-05-16 21:21:51 +02:00
Laurent Destailleur	9f8f45d5bc	FIX Payment on supplier invoice should not mix credit note and standard invoices.	2019-05-14 12:00:58 +02:00
Francis Appels	a2d4a59321	Merge branch 'develop' into clean_10_beta	2019-05-13 21:27:13 +02:00
Regis Houssin	62489d1f5e	FIX replace "dir_output" with "multidir_output"	2019-05-12 14:41:30 +02:00
Regis Houssin	b73df2698d	FIX better compatibility with Multicompany	2019-05-12 14:25:41 +02:00
Laurent Destailleur	aaeb7dc9d6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/holiday.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-10 17:45:33 +02:00
Laurent Destailleur	9de0e69456	FIX column project into list	2019-05-10 15:11:06 +02:00
Laurent Destailleur	5625c94c44	Fix missing label on project tooltip	2019-05-10 14:40:15 +02:00
Laurent Destailleur	0e8184332e	Fix missing label on project tooltip	2019-05-10 14:39:05 +02:00
Laurent Destailleur	a94c291b76	Dolibarization	2019-05-09 16:59:06 +02:00
Laurent Destailleur	74875690a0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/massactions_pre.tpl.php	2019-05-08 19:14:31 +02:00
Laurent Destailleur	f6de2d091d	FIX Sending email to mass actions send same email on same customer	2019-05-08 19:07:12 +02:00
Francis Appels	03e2983d40	Merge branch 'develop' into clean_10_beta	2019-05-06 15:22:27 +02:00
Laurent Destailleur	4f9ea912ab	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/website.inc.php	2019-05-02 14:41:56 +02:00
Laurent Destailleur	e2c7c0574e	Merge pull request #11086 from andreubisquerra/master NEW Add history to view and print previous sales on TakePos.	2019-05-02 14:04:57 +02:00
Ferran Marcet	be17e31be1	New: Add ref_client field on template invoice	2019-05-02 11:04:55 +02:00
Francis Appels	18c5c586ab	Cleanup set_draft in syslog	2019-05-01 09:38:27 +02:00
Laurent Destailleur	9c45b781af	Fix balance of colspan	2019-04-30 16:44:11 +02:00
Laurent Destailleur	2136bce4b0	FIX missing situation invoice in list	2019-04-30 15:10:38 +02:00
andreubisquerra	00db274956	Add history to view and print previous sales.	2019-04-28 18:12:33 +02:00
Ferran Marcet	7a651b5071	New: Add ref_client field on template invoice	2019-04-26 13:53:22 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Laurent Destailleur	4d92d7731c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/sendings.lib.php htdocs/langs/en_US/admin.lang htdocs/theme/eldy/style.css.php	2019-04-23 12:32:08 +02:00
Laurent Destailleur	84ec39f043	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-23 12:25:53 +02:00
John BOTELLA	0855d84ccf	FIX error messages not displayed	2019-04-18 10:40:34 +02:00
Laurent Destailleur	e6ffaeefe5	CSS	2019-04-17 10:39:30 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Laurent Destailleur	cf058e7d3b	NEW Ask date of invoice when using the Clone feature.	2019-04-12 12:12:08 +02:00
ATM john	bc4db54722	add more class	2019-04-11 21:29:01 +02:00
ATM john	3390ba0e77	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_look_and_feel_title_button	2019-04-11 21:16:42 +02:00
Laurent Destailleur	8079a389f8	Merge pull request #10992 from altatof/faccard2 NEW : retrieve invoice infos from order when billing shipment	2019-04-11 16:34:42 +02:00
Laurent Destailleur	f2fd07d824	Merge pull request #10991 from altatof/faccard NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN	2019-04-11 16:31:37 +02:00
Laurent Destailleur	4f87018c33	Update card.php	2019-04-11 16:31:13 +02:00
ATM john	29b31bd7ab	New title button first step	2019-04-11 00:38:44 +02:00
Christophe Battarel	46e398f3d3	NEW : retrieve invoice infos from order when billing shipment	2019-04-10 10:50:01 +02:00
Christophe Battarel	b04296984d	NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN	2019-04-10 10:29:17 +02:00
Christophe Battarel	5f9f615e11	fix form_conditions_reglement parameters	2019-04-09 18:37:36 +02:00
Christophe Battarel	790c5f493a	fix select_conditions parameters	2019-04-09 18:32:00 +02:00
Christophe Battarel	01255602d8	fix select_conditions parameters	2019-04-09 18:30:58 +02:00
Christophe Battarel	5382ad207f	NEW : add payment terms to invoices list	2019-04-09 18:26:00 +02:00
Laurent Destailleur	1274d71a10	Fix phpcs	2019-04-08 16:00:01 +02:00
Dan Rusu	4597e78a9d	Re synchronized the UI action button "Mark as credit available" with API At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places	2019-04-06 20:10:11 +03:00
Laurent Destailleur	ec9fdc1321	Fix regression with class="right". Style of amount lost.	2019-03-31 11:25:29 +02:00
Laurent Destailleur	5e23c4c03c	Fix self: not defined in a page	2019-03-29 16:23:55 +01:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	11e4411400	TakePOS Can enter payment in several times and with different modes	2019-03-27 15:42:53 +01:00
Laurent Destailleur	a34f4c2806	Merge pull request #10909 from IonAgorria/fix-line-dates FIX: Disallow line start date after end date	2019-03-26 19:43:11 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Ion	7bfa49b29c	FIX: Disallow line start date > end date	2019-03-24 14:30:00 +01:00
Laurent Destailleur	28fede950f	Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION	2019-03-22 13:00:48 +01:00
Laurent Destailleur	a7181750c6	Merge pull request #10879 from altatof/noconcatdesc NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-22 12:56:46 +01:00
Laurent Destailleur	48a0c447b4	Fix test on draft status regression	2019-03-21 21:00:06 +01:00
Laurent Destailleur	47eb256b82	Fix phpcs	2019-03-21 18:22:17 +01:00
Laurent Destailleur	930720decd	WIP Start to replace use of property ->brouillon	2019-03-21 18:13:51 +01:00
Laurent Destailleur	90df30e412	NEW Add trigget FICHINTER_UNVALIDATE Standardize code of setDraft.	2019-03-21 17:37:56 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Frédéric FRANCE	89e8889c5c	phpcs fix v9	2019-03-19 16:33:34 +01:00
Laurent Destailleur	eab11ce743	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2019-03-19 13:14:44 +01:00
Laurent Destailleur	dbe15d3685	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-19 13:10:17 +01:00
Laurent Destailleur	b11403103b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:48 +01:00
Laurent Destailleur	8664594fc8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:39 +01:00
Laurent Destailleur	eaaea2c2f9	Fix set of due date when invoice created from API	2019-03-19 12:08:55 +01:00
Laurent Destailleur	bca10084c5	Merge pull request #10882 from alexandreaj/patch-1 Update api_invoices.class.php	2019-03-19 12:07:16 +01:00
Laurent Destailleur	70cb042e58	Update api_invoices.class.php	2019-03-19 12:06:57 +01:00
Laurent Destailleur	b10690ce88	Merge pull request #10874 from grandoc/translation translation	2019-03-19 11:14:40 +01:00
Laurent Destailleur	6bead00260	Better text	2019-03-19 10:27:36 +01:00
Laurent Destailleur	3f62098b81	Add hours in date	2019-03-19 10:14:13 +01:00
alexandreaj	9bb1ede65a	Update api_invoices.class.php Adding possibility to set due date (date_lim_reglement field in mysql) via the API.	2019-03-18 21:11:13 +01:00
Laurent Destailleur	41c737a213	Fix, Oops, test was inverted	2019-03-18 20:16:19 +01:00
Laurent Destailleur	aa013ff753	Fix do we really must copy notes when creating an object from another source object? Add a hack with hidden option to be able to change this.	2019-03-18 20:09:09 +01:00
Christophe Battarel	8b3fd2eacf	NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-18 16:10:17 +01:00
Philippe GRAND	c13a1dbc63	translation	2019-03-18 13:45:24 +01:00
Philippe GRAND	0f03b16313	translation	2019-03-18 12:46:32 +01:00
Laurent Destailleur	89087c6847	Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice Wrong vat if deposit from propal with multiple vat	2019-03-18 11:14:11 +01:00
Regis Houssin	57091f08b0	FIX missing entity filter and wrong var name	2019-03-18 10:53:43 +01:00
Laurent Destailleur	1abfd1f58e	Add page to setup module debugbar Fix CSS	2019-03-17 00:32:39 +01:00
Laurent Destailleur	7cdfff7263	Fix syntax error	2019-03-15 20:42:49 +01:00
Laurent Destailleur	875b5b6a8d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php htdocs/projet/card.php htdocs/public/opensurvey/studs.php	2019-03-15 19:20:22 +01:00
Laurent Destailleur	39e24d30aa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-15 19:18:30 +01:00
Laurent Destailleur	681d626284	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-15 19:17:31 +01:00
Laurent Destailleur	b33c366b02	Update card.php	2019-03-15 19:16:49 +01:00
Laurent Destailleur	c0b6699b25	All methods set_draft() were renamed into setDraft()	2019-03-15 19:01:40 +01:00
Laurent Destailleur	a2d6723ff3	WIP Link files to expense report lines	2019-03-15 15:07:52 +01:00
gauthier	a524bbc5c6	FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line)	2019-03-13 15:59:41 +01:00
Laurent Destailleur	eeafc3c630	Standardize translation of amount	2019-03-13 14:10:36 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
Joan Louis	17647de4cc	Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-12 11:24:54 +01:00
Joan Louis	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
Joan Louis	ee5753819e	Update call to extrafields from cards	2019-03-11 14:22:04 +01:00
atm-quentin	ab781c32c7	Wrong vat if deposit from propal with multiple vat	2019-03-11 11:28:25 +01:00
Laurent Destailleur	f3ca69522e	Fix phpcs	2019-03-11 01:41:09 +01:00
Laurent Destailleur	a426c8e9bf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/filecheck.php htdocs/compta/facture/class/facture.class.php htdocs/filefunc.inc.php htdocs/install/upgrade2.php htdocs/product/class/product.class.php	2019-03-07 11:16:24 +01:00
Laurent Destailleur	b15e00cae7	FIX Autodetect buy price for invoices autogenerated with templates.	2019-03-06 21:39:09 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	63d14b16c9	FIX The notes was also copied on invoice	2019-03-04 14:56:39 +01:00
Laurent Destailleur	db13e54724	FIX The notes was also copied on invoice	2019-03-04 14:54:59 +01:00
Laurent Destailleur	1686b7b1db	FIX label of bank account	2019-03-04 14:42:00 +01:00
Laurent Destailleur	fe5cb57df8	FIX label of bank account	2019-03-04 14:41:20 +01:00
Laurent Destailleur	4cb5c9ef35	Var not initialized	2019-03-02 19:26:01 +01:00
Laurent Destailleur	a5711a51ab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/json.lib.php test/phpunit/JsonLibTest.php	2019-03-02 18:30:17 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	50f6bbefe7	Merge pull request #10720 from frederic34/patch-5 Update facture-rec.class.php	2019-03-02 18:23:26 +01:00
Laurent Destailleur	56d921ea52	CSS	2019-03-02 12:57:07 +01:00
Frédéric FRANCE	728a3fcbba	Update facture-rec.class.php	2019-03-02 08:43:09 +01:00
Frédéric FRANCE	4fcde0eaa3	Update facture-rec.class.php	2019-03-02 01:37:49 +01:00
Frédéric FRANCE	62501b11e8	add visibility	2019-03-02 00:14:22 +01:00
Frédéric FRANCE	be8db31388	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-03-01 19:24:27 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Laurent Destailleur	2e128a786b	NEW Can change the customer account of an instance	2019-03-01 15:38:15 +01:00
Frédéric FRANCE	796ea6f4ea	add visibility	2019-02-28 23:19:58 +01:00
Laurent Destailleur	b3fb0eaf5b	Merge branch 'develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 15:48:31 +01:00
Laurent Destailleur	3bffa69f1d	Remove deprecated code	2019-02-27 15:23:56 +01:00
Frédéric FRANCE	81f2f99db5	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-26 21:16:01 +01:00
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Frédéric FRANCE	346d1f410c	wip	2019-02-25 23:15:48 +01:00
Laurent Destailleur	8a9339a059	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/api_invoices.class.php	2019-02-25 15:16:23 +01:00
Laurent Destailleur	dde18e803d	Fix transaction	2019-02-25 15:09:56 +01:00
Laurent Destailleur	3f078203b9	Fix phpcs	2019-02-24 20:29:01 +01:00
Frédéric FRANCE	4b0b8e1c1f	Update api_invoices.class.php	2019-02-23 16:44:36 +01:00
Frédéric FRANCE	0e093ffb24	Update api_invoices.class.php	2019-02-23 16:41:40 +01:00
Frédéric FRANCE	f1e4c80771	Update api_invoices.class.php	2019-02-23 16:39:15 +01:00
Laurent Destailleur	f83f746123	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php	2019-02-23 16:03:40 +01:00
Laurent Destailleur	cdf85b0d00	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-23 16:02:35 +01:00
ptibogxiv	d7ffcca59b	FIX fetch module / pos source	2019-02-23 16:00:07 +01:00
Laurent Destailleur	0298582fc3	Merge pull request #10640 from ptibogxiv/patch-122 FIX fetch module / pos source	2019-02-23 15:59:22 +01:00
Laurent Destailleur	2413c41622	Merge pull request #10639 from ptibogxiv/patch-121 NEW POS support in order (ex: online cart)	2019-02-23 15:19:10 +01:00
Laurent Destailleur	b3c3e8f09e	Merge pull request #10547 from Rusu-Marian-Dan/develop New API markAsCreditAvailable	2019-02-23 14:39:13 +01:00
Laurent Destailleur	ca45651265	Update api_invoices.class.php	2019-02-23 14:38:13 +01:00
Laurent Destailleur	eb733728c3	Update api_invoices.class.php	2019-02-23 14:37:09 +01:00
Laurent Destailleur	5bf3a1f175	Update api_invoices.class.php	2019-02-23 14:36:51 +01:00
Laurent Destailleur	3d0af97e79	Update api_invoices.class.php	2019-02-23 14:24:37 +01:00
ptibogxiv	98affe0921	Update facture.class.php	2019-02-20 14:25:25 +01:00
ptibogxiv	152585c1b8	Update facture.class.php	2019-02-20 13:20:46 +01:00
ptibogxiv	ef5372f476	Update facture.class.php	2019-02-20 13:04:22 +01:00
ptibogxiv	6416f24d5f	FIX fetch module / pos source	2019-02-20 12:35:13 +01:00
ptibogxiv	c0de2b5b07	Update facture.class.php	2019-02-20 12:22:02 +01:00
Laurent Destailleur	e4698fb6a5	Merge	2019-02-18 19:14:25 +01:00
Laurent Destailleur	ad7b8371da	FIX Mark credit note as available for credit note in other currency Conflicts: htdocs/compta/paiement.php htdocs/core/class/discount.class.php	2019-02-18 18:30:15 +01:00
Laurent Destailleur	07d1559802	FIX Mark credit note as available for credit note in other currency	2019-02-18 18:27:06 +01:00
Laurent Destailleur	b2ec340a48	FIX Show button POS Ticket only if invoice was generated by POS	2019-02-18 17:04:53 +01:00
Dan Rusu	75e52628ec	Merge remote-tracking branch 'upstream/develop' into develop	2019-02-16 09:07:44 +02:00
Frédéric FRANCE	b892fc7182	Update api_invoices.class.php	2019-02-14 18:22:35 +01:00
ptibogxiv	7f3f166a81	NEW link/delete contact in invoice object	2019-02-14 00:44:40 +01:00
Laurent Destailleur	b9467c10bf	Merge pull request #10561 from eoxia-jimmy/develop NEW: API Proposal, Orders, Invoices: Add contact details	2019-02-13 16:39:57 +01:00
Frédéric FRANCE	56bbe41917	Update facture-rec.class.php	2019-02-12 23:54:38 +01:00
Jimmy L	a172ea00a4	Rest API: Proposal, Orders, Invoices: Add contact details	2019-02-12 17:54:59 +01:00
Laurent Destailleur	3e1b75e916	Merge pull request #10541 from grandoc/new_branch_10_02_2019 update with html5 compliant code	2019-02-12 13:35:27 +01:00
Dan Rusu	57e2971a22	fix code indent	2019-02-11 19:58:01 +02:00
Dan Rusu	9ce4b91f5d	NEW \| make credit note from invoice inspired from the action of the button "Make credit note" from UI. - load invoice data and lines - check invoice type - calculate totals and create new credit notes - create DiscountAbsolute & commit changes	2019-02-11 09:31:43 +02:00
Dan Rusu	0698ddbd77	Revert "add API method to create credit note from invoice" This reverts commit `288a876491`.	2019-02-11 09:24:16 +02:00
Dan Rusu	288a876491	add API method to create credit note from invoice	2019-02-11 09:14:06 +02:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Philippe GRAND	19885cb465	update with html5 compliant code	2019-02-10 10:23:37 +01:00
Philippe GRAND	673e09d7c2	update with html5 compliant code	2019-02-10 10:21:54 +01:00
Philippe GRAND	508d6345a1	update with html5 compliant code	2019-02-10 10:16:58 +01:00
Philippe GRAND	c071e488cf	update with html5 compliant code	2019-02-10 10:10:41 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +01:00
Laurent Destailleur	8abebb091c	Var no more used	2019-02-08 09:33:01 +01:00
Laurent Destailleur	24955088de	Merge pull request #10501 from hregis/8.0_mc FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-08 09:31:26 +01:00
gauthier	29e4fce450	FIX : can't add lines on invoices	2019-02-06 12:35:23 +01:00
Regis Houssin	8860eab6b1	FIX wrong merged conflict	2019-02-05 07:40:50 +01:00
Regis Houssin	4a19cba257	FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-05 06:34:05 +01:00
Philippe GRAND	6b9b17f93e	update with html5 compliant code	2019-02-04 13:57:38 +01:00
Philippe GRAND	a14332b2b0	update with html5 compliant code	2019-02-04 13:51:39 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Pierre Ardoin	30548d977f	Prise en charge des Travaux supplémentaires Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.	2019-01-29 11:19:11 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	77747ac2a3	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-28 16:35:12 +01:00
Laurent Destailleur	0827929ede	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-28 16:29:34 +01:00
Laurent Destailleur	f7bcd1ef6d	Fix trans	2019-01-28 01:35:12 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	ba87284a90	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-26 14:30:44 +01:00
Laurent Destailleur	a5daa25707	Move common code to get sell price into a method	2019-01-24 19:45:17 +01:00
gauthier	84e1f92acd	FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;	2019-01-23 15:16:51 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Philippe GRAND	8096844062	update with html5 compliant code	2019-01-18 10:10:39 +01:00
Laurent Destailleur	58bda12e22	css	2019-01-17 19:31:01 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Laurent Destailleur	2e55bdf087	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-17 19:11:18 +01:00
Laurent Destailleur	16bb85b7fa	Merge pull request #10348 from a-schild/9.0 Fix for issue #10333 branch 9.0	2019-01-17 18:58:49 +01:00
Laurent Destailleur	3a8afafabd	Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice New manage multicompany for invoice	2019-01-16 18:51:01 +01:00
Laurent Destailleur	f8973c9a22	Fix translation Late <> Alert	2019-01-16 17:44:39 +01:00
Laurent Destailleur	e7943ae844	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 16:48:52 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
a-schild	7e3bfd332e	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-16 13:07:00 +01:00
a-schild	7df86cb630	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-16 13:06:12 +01:00
a-schild	2f5db98a5c	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-16 13:05:22 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
atm-quentin	0d384eea00	FIX credit note can have negative value	2019-01-16 09:33:24 +01:00
André Schild	1c0e15192d	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-15 20:43:16 +01:00
Laurent Destailleur	22d4afbb62	Missing trans	2019-01-10 01:54:06 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
diversity-co-uk	2dc87509ff	Fix Invoice PUT, remove extra parameter The first parameter is expected to be the user. The $id of the invoice is already contained in $this See facture.class.php 1610: function update(User $user, $notrigger=0)	2019-01-08 14:17:33 +01:00
mapiolca	bab82a77b5	Update card.php Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.	2019-01-05 22:42:51 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	3af418349a	FIX Can't empty the payment mode	2018-12-29 07:54:30 +01:00
ldestailleur	0353bd5302	FIX sql error when resetting payment mode / term	2018-12-29 07:48:47 +01:00
ldestailleur	2225d0a41e	FIX sql error when resetting payment mode / term	2018-12-28 23:16:44 +01:00
Laurent Destailleur	0f76279a03	FIX Missing token and style	2018-12-27 03:46:14 +01:00
Laurent Destailleur	791b2f485a	FIX Missing token and style	2018-12-27 03:45:30 +01:00
Laurent Destailleur	9b55cc401e	Fix trans	2018-12-22 11:32:27 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	b511a056f4	Fix phpcs	2018-12-15 11:48:21 +01:00
Laurent Destailleur	baf9b6f309	Fix regression (bad name of function)	2018-12-14 19:21:19 +01:00
Laurent Destailleur	38ddfd9a62	Merge pull request #10152 from defrance/patch-134 refactoring list.php with dol_sql_datefilter	2018-12-14 19:06:29 +01:00
Laurent Destailleur	59bc15377d	CSS	2018-12-14 18:58:55 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	e7b703f0c0	Merge pull request #10154 from bugness-chl/develop-hookfacturerec NEW Adding hooks to facturerec	2018-12-14 16:11:34 +01:00
Laurent Destailleur	c377350c35	Update facture-rec.class.php	2018-12-14 16:09:12 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	4a61c1b6ed	FIX lang not loaded	2018-12-11 13:25:09 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Chl	b67101c77c	corr. #10154	2018-12-03 18:09:25 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Chl	864ce85341	NEW adding hooks to createRecurringInvoices() For example : send the newly generated invoice by mail. We send the counter and the total so launching some action on the last loop (generated invoice or error) is possible. (bonus: correcting error reporting $this->errors to $this->errors[] )	2018-12-02 01:34:13 +01:00
Chl	95b5d8790d	corr. typo	2018-12-02 01:34:13 +01:00
Chl	6ea0919ebb	facture-rec.class.php: reindent	2018-12-02 01:34:13 +01:00
BENKE Charlene	b104c0889d	Update list.php	2018-12-01 23:44:24 +01:00
Laurent Destailleur	0367795488	Fix auto jump on record if only 1 record in a search	2018-11-27 11:09:47 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
atm-quentin	56d4a8a737	revert some code	2018-11-16 15:16:48 +01:00
atm-quentin	70fdff5c27	revert getNextValue function + createfromclone entity	2018-11-16 11:23:14 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
atm-quentin	8e51204dff	manage invoice with multicompany	2018-11-16 11:14:33 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Regis Houssin	6f90516f57	FIX check write permission for multicurrency	2018-11-15 09:40:08 +01:00
Regis Houssin	976094043b	FIX missing GETPOST('entity')	2018-11-14 17:34:27 +01:00
Regis Houssin	3294fada3d	FIX working on invoice sharing (multicompany)	2018-11-14 14:59:36 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	0c7f33e1ba	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:58:19 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Laurent Destailleur	e1e0001fda	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 09:56:00 +01:00
Frédéric FRANCE	da3ee9ad9a	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-10-30 19:04:35 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Laurent Destailleur	0127682996	Merge pull request #9881 from grandoc/8.0 merging and typo	2018-10-30 12:41:56 +01:00
Laurent Destailleur	8fbf5b1f33	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:28:19 +01:00
Laurent Destailleur	0266db7aa8	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:19:40 +01:00
Laurent Destailleur	d02fccd7e4	Fix deletion of draft invoice	2018-10-29 14:56:00 +01:00
Laurent Destailleur	824757bca6	Fix perm to delete	2018-10-29 14:47:33 +01:00
Laurent Destailleur	27d82d0e8e	FIX Delete of draft invoice	2018-10-29 14:41:00 +01:00
Laurent Destailleur	85b8c9f219	FIX Delete of draft invoice	2018-10-29 14:35:42 +01:00
Frédéric FRANCE	42a9abad56	remove fieldlabel and add fieldeditkey	2018-10-27 17:45:29 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Maxime Kohlhaas	1b054f1b36	Fix invoice creation from contract was invoicing closed services #9087	2018-10-27 09:21:49 +02:00
Laurent Destailleur	852b069785	Fix reponsive in stats pages	2018-10-26 15:46:17 +02:00
Philippe GRAND	f450e04856	Merge remote-tracking branch 'upstream/8.0' into 8.0	2018-10-26 15:38:15 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Frédéric FRANCE	5f6cbda5a6	Update facture.class.php	2018-10-20 22:34:00 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	762d82f2fe	Move declaration into common	2018-10-19 13:38:05 +02:00
Laurent Destailleur	cff2b923f9	Merge pull request #9784 from ptibogxiv/patch-80 FIX harmony in date name with API	2018-10-19 13:29:59 +02:00
Laurent Destailleur	05326e271d	FIX Filter on invoice type	2018-10-18 17:15:26 +02:00
gauthier	aea7299970	FIX : use discount with multicurrency	2018-10-17 15:49:08 +02:00
ptibogxiv	a77458cb36	Update facture.class.php	2018-10-17 00:07:21 +02:00
ptibogxiv	3fdf3c95b4	FIX harmony in date name with API	2018-10-17 00:04:44 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Laurent Destailleur	5d9b770511	phpcs	2018-10-15 13:32:09 +02:00
Laurent Destailleur	df4b3b09d2	Fix var not defined	2018-10-15 13:30:07 +02:00
Laurent Destailleur	abf8867061	Merge pull request #8207 from atm-john/New_invoice_default_documents NEW hidden option to define an invoice template for each invoice type	2018-10-14 16:36:37 +02:00
Maxime Kohlhaas	9be8c579d0	New massaction to generate PDF	2018-10-14 15:50:55 +02:00
Laurent Destailleur	a2aa491c51	Merge pull request #9728 from atm-john/8.0_Fix_count_error Fix count on no countable object	2018-10-12 17:52:30 +02:00
Laurent Destailleur	1ab6cd4b59	Update card.php	2018-10-12 17:51:32 +02:00
John BOTELLA	92686100b2	Fix count on no countable object	2018-10-11 10:51:54 +02:00
John BOTELLA	ee225a2b8b	FIX situation prev percent	2018-10-11 10:14:22 +02:00
Laurent Destailleur	8f4b74733c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php	2018-10-10 01:51:54 +02:00
Laurent Destailleur	b73a2a24ef	FIX Tooltip on invoice widget	2018-10-10 01:16:53 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	84605bc59b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-09 16:59:47 +02:00
Philippe GRAND	e9bd1be41b	Standardize and update code	2018-10-09 15:38:42 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	35d5a495de	Save pos_source with id of POS station	2018-10-08 22:51:20 +02:00
Laurent Destailleur	41f2289ffa	Save pos station into invoice	2018-10-08 22:28:30 +02:00
Laurent Destailleur	19cf649b48	Add field to track source module of invoice	2018-10-07 13:59:40 +02:00
Nicolas Aupetit	49693854ce	Typo fix: "eee" in localtax1 display	2018-10-06 13:51:46 +11:00
Philippe GRAND	94df8d297d	Standardize code	2018-10-05 15:44:57 +02:00
Marc de Lima Lucio	82651cd920	FIX: invoice stats: situation invoices were not counted	2018-10-05 12:12:04 +02:00
Laurent Destailleur	17e4af50ec	Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name FIX : Wrong variable name	2018-10-04 18:47:08 +02:00
Laurent Destailleur	20f45db6b8	Merge pull request #9677 from grandoc/new_branch_04_10_2018 Standardize and update code	2018-10-04 18:33:24 +02:00
Laurent Destailleur	b3b2305651	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/pdf.lib.php	2018-10-04 17:56:56 +02:00
Laurent Destailleur	13759ea146	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2018-10-04 17:53:40 +02:00
John BOTELLA	0e310a7ffd	FIX invoice delay on invoice list	2018-10-04 14:11:51 +02:00
John BOTELLA	0b3d09fa64	Fix retained warranty delay on list	2018-10-04 12:01:24 +02:00
John BOTELLA	cf89b850ee	Fix retained warranty delay	2018-10-04 11:37:04 +02:00
John BOTELLA	55e26dc531	FIX invoice has delay	2018-10-04 11:09:16 +02:00
ATM-Nicolas	c048f51562	FIX : Wrong variable name	2018-10-04 09:54:40 +02:00
Philippe GRAND	8bee69277d	Standardize and update code	2018-10-04 09:33:30 +02:00
aplose	8ee7a48583	Fix issue #9434 : no array_options available when calling api : I replace the deprecated code by the fetch_optionnals() recommanded call.	2018-10-03 15:15:46 +02:00
John BOTELLA	af66a8971a	NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT	2018-10-02 15:51:17 +02:00
John BOTELLA	30d62e9fc5	fix retained warranty amount	2018-10-01 15:19:35 +02:00
Laurent Destailleur	adc36e7d63	Clean code	2018-10-01 00:20:47 +02:00
Laurent Destailleur	e2f450aa8c	Fix regession losing description. Rename updateligne into updateline.	2018-09-28 16:15:17 +02:00
John BOTELLA	d8cd1c3fef	Fix total retained warranty	2018-09-28 09:03:37 +02:00
Laurent Destailleur	a88dcfd1e4	Fix phpcs	2018-09-28 02:24:11 +02:00
John BOTELLA	70eddf5d55	Add retained warranty in list	2018-09-27 15:38:43 +02:00
Laurent Destailleur	e252a5f046	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-27 12:55:45 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	26d20d0b76	Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price NEW Advanced permission to ignore price min	2018-09-27 09:57:49 +02:00
Laurent Destailleur	ee8b5030a0	Merge pull request #9610 from atm-john/FIX_situation_credit_note Fix situation credit note	2018-09-27 09:26:23 +02:00
Laurent Destailleur	e3b1cb9fdb	Update facture.class.php	2018-09-27 09:25:37 +02:00
Philippe GRAND	746d73b8e6	Add some code comment	2018-09-25 17:26:57 +02:00
John BOTELLA	40369280ba	fix allow empty selection on form conditions reglement	2018-09-25 12:16:16 +02:00
John BOTELLA	022f842cb0	Fix display good progress for new situation invoices	2018-09-25 10:28:47 +02:00
John BOTELLA	791c373db5	FIX credit note progression	2018-09-25 09:54:58 +02:00
Laurent Destailleur	b93ab79679	FIX Error messages	2018-09-25 00:39:28 +02:00
John BOTELLA	b1380a6902	FIX situation invoice total with credit note	2018-09-24 16:12:00 +02:00
Laurent Destailleur	ad6895aa2e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-24 10:23:09 +02:00
Laurent Destailleur	57e359cd40	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:18:13 +02:00
Laurent Destailleur	dbb75e35a1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:14:38 +02:00
Laurent Destailleur	e6791e1763	Merge pull request #9526 from frederic34/patch-10 completely comment unused code	2018-09-18 14:59:55 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	74a9c680df	FIX "Other ..." link so the "Back to" link works.	2018-09-16 12:27:56 +02:00
Frédéric FRANCE	7b3b020533	completely comment unused code	2018-09-16 09:41:38 +02:00
Laurent Destailleur	961505d510	NEW Add filter on staff range in list of thirdparties	2018-09-14 01:29:03 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	de8496773d	Merge pull request #9441 from grandoc/new_branch_09_09_2018 New branch 09 09 2018	2018-09-12 18:24:34 +02:00
Laurent Destailleur	3662ebe3a3	Fix syntax error	2018-09-12 18:05:20 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Maxime Kohlhaas	c94689e9a9	FIX remain to pay for credit note was wrong on invoice list	2018-09-12 11:53:57 +02:00
Laurent Destailleur	aad6a0871f	FIX Lose filter on payment type or category after a sort on invoice list Conflicts: htdocs/compta/facture/list.php	2018-09-12 10:59:53 +02:00
Laurent Destailleur	7bea9f5ffb	FIX Lose filter on payment type or category after a sort on invoice list	2018-09-12 10:57:09 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Philippe GRAND	7fcbd0fe42	Standardize and update code	2018-09-09 11:10:32 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Maxime Kohlhaas	a5f4a74ecc	FIX : Homepage links were using wrong topmenus	2018-09-06 14:49:48 +02:00
Philippe GRAND	9025fd5891	Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0	2018-09-06 14:33:46 +02:00
Philippe GRAND	844333688b	typo	2018-09-06 14:33:22 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Philippe GRAND	38ca6096b2	Standardize and update code	2018-09-05 10:31:12 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	bdcac95761	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 15:15:23 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Laurent Destailleur	3ef808cb9b	Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken	2018-09-04 11:23:28 +02:00
Laurent Destailleur	9042d341f0	FIX #9316 Error when listing invoices	2018-09-04 11:19:31 +02:00
Laurent Destailleur	e7d2bcc34c	FIX #9316 Error when listing invoices	2018-09-04 11:17:08 +02:00
Laurent Destailleur	9697bdf3b0	FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES	2018-09-04 10:38:09 +02:00
Laurent Destailleur	db6f80e2ff	FIX invoice popup hide localtax2 and 3 if not defined	2018-09-04 00:42:15 +02:00
Laurent Destailleur	3d50c454c1	Code comment	2018-09-03 17:05:44 +02:00
Frédéric FRANCE	22b9632555	move phpcs:ignore	2018-09-02 21:08:57 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Laurent Destailleur	c2548b8b39	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm NEW hook formConfirm always called if hooked	2018-09-01 14:50:08 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
ksar-ksar	49d3bea192	Remove the test After discussion with Frederic, the best solution is to remove the test	2018-08-30 11:27:48 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	0eb4f8bb96	NEW Can set the datestart and dateend of cron job into module descriptor	2018-08-29 11:47:20 +02:00
Laurent Destailleur	b5c2383f65	Fix type of invoice encoded twice	2018-08-28 18:34:53 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
Frédéric FRANCE	d8bf4a0ecf	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-25 09:07:04 +02:00
ksar-ksar	a844855ade	Update hook formConfirm The hook should be called when the $formconfirm is not empty	2018-08-24 16:40:26 +02:00
Laurent Destailleur	32594e8048	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-24 10:47:10 +02:00
Laurent Destailleur	a82d86cec4	FIX warning for late template invoices to remove when suspended	2018-08-24 10:46:47 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	7103bfd7aa	Merge pull request #9253 from frederic34/patch-11 Update list.php	2018-08-21 13:11:26 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	e63a748a70	Update list.php	2018-08-16 11:59:58 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	b977c3a9f5	Fix translation	2018-08-13 14:04:10 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Laurent Destailleur	2f559a7edb	Merge pull request #9199 from atm-quentin/FIX_hook_update_price NEW Add hook changeRoundingMode in update_price	2018-08-12 18:17:52 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
John BOTELLA	681ae88e97	fix display cond	2018-08-10 16:59:22 +02:00
John BOTELLA	6fad0ea5bd	Add retained warranty to pdf	2018-08-10 16:03:39 +02:00
John BOTELLA	d6d8f98f38	add retained warranty cond field and add forms	2018-08-10 15:06:00 +02:00
Frédéric FRANCE	62b83412ee	test phpcs v3	2018-08-09 11:31:48 +02:00
John BOTELLA	06be98c638	add date field	2018-08-08 17:36:39 +02:00
Juanjo Menent	229a5d3532	Merge pull request #9203 from grandoc/new_branch_04_08_2018 comment translation	2018-08-08 11:07:18 +02:00
John BOTELLA	3036c94198	Add new situation retained warranty field	2018-08-07 15:18:42 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
atm-quentin	6662bf05ba	FIX hook on update price AND fix id on line	2018-08-03 11:47:43 +02:00
ATM-Nicolas	342a3ef663	NEW : Withdraw request massaction	2018-08-03 09:57:29 +02:00
Laurent Destailleur	e85ec19018	Merge pull request #9093 from atm-gauthier/FIX_filters FIX : page must always be 0 when we search	2018-08-02 17:48:35 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
John BOTELLA	4ddca02bb9	fix situation line's total	2018-07-31 14:58:33 +02:00
Philippe GRAND	d673848028	standardize	2018-07-30 17:28:44 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Laurent Destailleur	e024ea9c05	Merge pull request #9146 from grandoc/new_branch_24_07_2018 Clean and update code	2018-07-24 21:41:12 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Laurent Destailleur	ece655a84a	Merge pull request #9128 from atm-john/fix_situation_invoice_status Fix situation invoice status	2018-07-24 17:49:53 +02:00
Laurent Destailleur	869a97c8d1	Update card.php	2018-07-24 17:49:10 +02:00
Chl	0f115dafee	2 bugfix for PDF generated by Templates/Cron: DueDate and translation When launching Cron on a facturerec with auto_validate at 1, the generated PDF doesn't contain the DueDate, and some tokens like __INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not translated (tested with fr_FR).	2018-07-24 00:39:21 +02:00
John BOTELLA	0c01f6e139	Fix situation invoice status	2018-07-20 15:53:32 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ADD Check right on link	2018-07-16 09:31:21 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	ed6ec8138d	Fix filter on invoice status	2018-07-06 16:06:15 +02:00
Laurent Destailleur	fb84211714	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 12:45:44 +02:00
Laurent Destailleur	6c5264fabb	Fix label	2018-07-06 12:45:20 +02:00
Inovea Conseil	7f137adef9	ADD check user's rights	2018-07-06 08:07:38 +02:00
Inovea Conseil	5011f252c1	ADD check user's rights	2018-07-05 19:00:41 +02:00
BENKE Charlene	c169ff4b97	Update facture.class.php	2018-07-05 12:01:48 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	3c176adb38	Fix more complete fix for bad label in creating invoice from other obj	2018-07-02 16:46:30 +02:00
Laurent Destailleur	cae7cabe6d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-02 16:22:55 +02:00
Laurent Destailleur	b22754c60b	FIX label of source object	2018-07-02 16:22:40 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	63f3143718	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-02 12:18:34 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
Regis Houssin	26495fb698	Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!	2018-07-01 18:49:37 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Laurent Destailleur	da138db528	FIX combo into popup become crazy with IE10 Conflicts: htdocs/asset/card.php htdocs/modulebuilder/template/myobject_card.php	2018-06-28 12:16:12 +02:00
Laurent Destailleur	3ea2d81279	FIX combo into popup become crazy with IE10	2018-06-28 12:05:02 +02:00
Laurent Destailleur	969b272576	Rename menu entries and report title for better understanding	2018-06-26 11:18:31 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	7f8570f720	Fix lang loading	2018-06-26 00:48:43 +02:00
Laurent Destailleur	af9d2c3b5a	Merge pull request #9008 from grandoc/new_branch_22_06_2018 clean and update code	2018-06-24 13:47:26 +02:00
Laurent Destailleur	0170906524	Look and feel	2018-06-23 14:39:24 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Philippe GRAND	afda5288a8	clean and update code	2018-06-22 16:27:11 +02:00
Laurent Destailleur	d81398e72d	Fix info on tooltip	2018-06-18 16:27:25 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
Laurent Destailleur	95ee3325fc	Part of fix of #8972	2018-06-18 11:11:07 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	c586f2ecf7	Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise	2018-06-13 21:20:42 +02:00
altatof	d42f00bca9	FIX : pu_ht_devise was not converted to numeric so decimals were lost when clculating total_ht_devise	2018-06-13 16:35:52 +02:00
Marc de Lima Lucio	e992187f4c	FIX: handle sortorder on multiple columns + potential SQL field mismatch	2018-06-12 16:00:16 +02:00
Regis Houssin	7ce2ebf1a9	Fix: wrong var name	2018-06-07 16:25:47 +02:00
Laurent Destailleur	a7b38db31f	Fix bug reported by scrutinizer	2018-06-06 18:55:50 +02:00
gauthier	77e7932671	FIX : sometimes amounts are identical but php find them different.	2018-06-05 11:33:58 +02:00
Laurent Destailleur	7c0afbe025	Clean code	2018-05-31 17:12:08 +02:00
Laurent Destailleur	c1f5c6becf	Merge pull request #8877 from frederic34/longlines soft limit length of lines to 500 chars	2018-05-30 11:19:29 +02:00
Laurent Destailleur	4d60fb3468	Fix size of popup	2018-05-29 10:57:14 +02:00
Laurent Destailleur	323bf6ef1f	Merge pull request #8873 from frederic34/loadlangs loadlangs	2018-05-29 10:07:10 +02:00
Laurent Destailleur	f83dedf1b0	Fix space/tab	2018-05-29 10:04:20 +02:00
Neil Orley	748be12da2	Get external contacts ids instead of BILLING contacts ids.	2018-05-28 09:42:24 +02:00
Neil Orley	4ad1f81ea9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2018-05-28 09:30:21 +02:00
Laurent Destailleur	5da89e1cad	Remove log	2018-05-27 19:33:46 +02:00
Laurent Destailleur	f3f252e88b	Fix duplicate record before creating primary key	2018-05-27 19:31:03 +02:00
Frédéric FRANCE	5c8f966898	Merge remote-tracking branch 'upstream/develop' into loadlangs	2018-05-27 18:41:17 +02:00
Laurent Destailleur	3f489ee3c6	Fix look and feel v7 for popup on ref of social contributions payments	2018-05-27 17:58:32 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
Frédéric FRANCE	84f2b31d46	loadlangs	2018-05-27 09:40:17 +02:00
Frédéric FRANCE	4d5c28b597	loadlangs	2018-05-27 09:27:09 +02:00
Laurent Destailleur	182abfdb5b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/societe/card.php	2018-05-25 15:02:24 +02:00
Laurent Destailleur	8a64ee2297	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/expedition/class/expedition.class.php htdocs/expedition/list.php htdocs/societe/card.php	2018-05-25 13:14:58 +02:00
Laurent Destailleur	b25c7e44d3	Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice FIX : test is_erasable() must be done before call function delete()	2018-05-25 11:05:20 +02:00
Laurent Destailleur	0a581e48d4	Update card.php	2018-05-25 11:04:04 +02:00
atm-quentin	eb224e43a5	FIX missing filters during ordering	2018-05-24 10:41:24 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
Laurent Destailleur	a1c799507a	Fix $contactobject not always defined	2018-05-23 08:16:24 +02:00
Neil Orley	15e02c7082	NEW : adds billing contacts ids to REST API returns adds billing contacts ids to REST API returns for proposals, orders and invoices	2018-05-22 11:40:32 +02:00
Laurent Destailleur	745aa4bd73	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-21 23:38:46 +02:00
Laurent Destailleur	8951c4a7a5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-21 23:36:47 +02:00
Laurent Destailleur	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
gauthier	4c3f9d6d5e	FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url	2018-05-18 15:20:16 +02:00
Laurent Destailleur	24281028b7	Merge pull request #8807 from inoveaconseil/patch-2 Fix missing params for commonGenerateDocument	2018-05-18 11:43:11 +02:00
Laurent Destailleur	e724cfd6a2	Merge pull request #8802 from atm-john/new_avoir_situation Add credit note compatibility with situation invoice.	2018-05-18 11:34:10 +02:00
Laurent Destailleur	e2369dea29	FIX #8722	2018-05-18 11:17:21 +02:00
Laurent Destailleur	dd53f414f8	Merge pull request #8788 from bugness-chl/develop Fix #8722 useless sql ORDER BY	2018-05-18 11:16:08 +02:00
John	3dd11e1eaf	Fix discount id	2018-05-18 11:02:04 +02:00
Laurent Destailleur	689ef37d56	Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element Add propals lines inport on invoices.	2018-05-18 08:55:29 +02:00
Inovea Conseil	5804d1d4a3	Fix missing params for commonGenerateDocument ADD param moreparams for compatibility with commonGenerateDocument	2018-05-17 10:16:44 +02:00
John	8175d90816	change case	2018-05-17 09:01:49 +02:00
Laurent Destailleur	ac97ba9e36	Fix deletion of stripe card Solve validation of recurring invoice	2018-05-16 20:41:01 +02:00
John	fddd3156b1	add hidden conf	2018-05-16 16:15:30 +02:00
John	c67ab2a758	add hidden conf	2018-05-16 16:14:49 +02:00
John	4a0195deee	Fix merge mistake	2018-05-16 15:55:56 +02:00
John	f773317bf5	remove comment and move table	2018-05-16 15:55:42 +02:00
John	b01893d536	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull	2018-05-16 15:29:57 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
John	05bb98f4c0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-05-16 11:49:37 +02:00
John	b42c87256c	Fix_situation_discount_used	2018-05-14 14:55:33 +02:00
Chl	9b2f62791b	Fix #8722 useless sql ORDER BY	2018-05-13 15:52:47 +02:00
atm-john	6b2dfa0528	Extend lines import to propal	2018-05-10 21:06:18 +02:00
atm-quentin	8cd6c72a2f	NEW advanced rights	2018-05-07 10:04:43 +02:00
Laurent Destailleur	97f161b276	Update list.php	2018-05-05 14:25:44 +02:00
Abbes Bahfir	17b8de2cdd	New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED	2018-05-05 12:57:29 +01:00
atm-quentin	ec5e84075e	NEW Rights to ignore price min	2018-05-03 10:18:38 +02:00
atm-quentin	21b387a4c4	NEW thirdparty categ filter on lists	2018-05-02 15:01:32 +02:00
Laurent Destailleur	3374c50e2d	CSS	2018-05-01 10:42:09 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Laurent Destailleur	e3142fff39	NEW Add method to register distributed payments on invoices	2018-04-27 11:38:31 +02:00
Laurent Destailleur	469d909126	Revert "Revert "NEW : Adds a contact to an invoice with REST API""	2018-04-27 10:46:09 +02:00
Laurent Destailleur	df9f4d3193	Revert "NEW : Adds a contact to an invoice with REST API"	2018-04-27 10:40:27 +02:00
Laurent Destailleur	fb582c2444	Merge pull request #8682 from Oeris/develop NEW : Adds a contact to an invoice with REST API	2018-04-27 10:37:04 +02:00
Laurent Destailleur	27997b8c11	Merge pull request #8675 from ATM-Nicolas/fix_link_credit_note Fix link credit note	2018-04-27 10:12:31 +02:00
Neil Orley	00fb4300fc	FIX : return type change from array to int	2018-04-26 12:03:55 +02:00
Neil Orley	bf3b99163d	NEW : Adds a payment for the list of invoices given as parameter Adds a payment for the list of invoices given as parameter ie : 1 payment for x invoice	2018-04-26 11:59:59 +02:00
Neil Orley	991d5c4215	NEW : Adds a contact to an invoice Adds a contact to an invoice using the REST API	2018-04-25 16:04:21 +02:00
Laurent Destailleur	5d01efb79d	Code comment	2018-04-24 20:27:02 +02:00
ATM-Nicolas	b272d766a9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_link_credit_note	2018-04-24 11:48:49 +02:00
ATM-Nicolas	64dde1595b	FIX : Credit note links set from source invoice links	2018-04-24 11:48:26 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not visible.	2018-04-24 11:37:57 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	c81c744aaf	Clean deprecated var	2018-04-21 13:14:58 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	1031fcd796	logs	2018-04-21 00:37:05 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	faea6861c3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/invoicetemplate_list.php htdocs/langs/en_US/bills.lang	2018-04-16 18:19:21 +02:00
Laurent Destailleur	622042e9b2	FIX Max nb of generation of recurring invoice should not show warning	2018-04-16 15:05:35 +02:00
Laurent Destailleur	f1ad3912e7	Fix multicompany compatibility for recurring invoice generation	2018-04-16 14:18:38 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	187cc35786	Look and feel v8	2018-04-14 22:23:56 +02:00
Laurent Destailleur	6f91b8019f	Remove warnings	2018-04-13 17:54:27 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
John	24bf8cb162	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-04-09 16:21:37 +02:00
John	63180f45a8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-09 09:17:26 +02:00
Laurent Destailleur	99ed9c4589	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/compta/facture/list.php	2018-04-08 13:10:10 +02:00
Laurent Destailleur	79af10fc83	Fix search filters	2018-04-08 13:01:42 +02:00
Laurent Destailleur	e7d69b18bd	Merge pull request #8504 from ATM-Nicolas/develop NEW : Add link between credit note invoice and origin	2018-04-06 09:15:02 +02:00
TuxGasy	47dcc0d5c6	fix notrigger ignored on BILL_CREATE	2018-04-05 18:32:41 +02:00
Laurent Destailleur	9892a97424	Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE fix notrigger ignored on BILL_CREATE	2018-04-05 18:27:45 +02:00
Laurent Destailleur	2d547abaa9	Merge pull request #8498 from atm-john/New_import_lines_from_linked_element New import lines from linked element	2018-04-05 18:26:47 +02:00
John	b02f34b038	Add line edit progress test	2018-04-05 17:13:45 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
John	689b3e3b64	Fix outing invoice ligne progress	2018-04-05 11:25:11 +02:00
John	b37a2f17bf	Fix credit note update on remove from cycle action	2018-04-05 10:48:20 +02:00
John	e966d11356	Fix credit note card apparence	2018-04-05 09:46:55 +02:00
TuxGasy	e5664f9630	fix notrigger ignored on BILL_CREATE	2018-04-04 20:32:36 +02:00
John	ce24ca08ee	move list of situation table and fix credit note display	2018-04-04 12:33:48 +02:00
ATM-Nicolas	b9a91c667f	NEW : Add link between credit note invoice and origin	2018-04-04 09:33:59 +02:00
John	299859d0c4	add action to remove from cycle	2018-04-03 17:34:20 +02:00
John	70321a8b71	add button to remove from cycle	2018-04-03 15:12:44 +02:00
John	b7681e7249	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-03 14:12:49 +02:00
John	d689e88b92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +02:00
John	227e4ef9a6	fix php compatibility	2018-04-03 10:50:15 +02:00
Laurent Destailleur	2d3a55a6a8	Restore broken confirmation popup	2018-03-31 23:39:08 +02:00
Laurent Destailleur	927d86f27f	Revert "NEW: formconfirm in javascript" This reverts commit `50790d5527`.	2018-03-31 23:10:12 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Laurent Destailleur	7c394733e4	Merge pull request #8445 from ATM-Consulting/develop_atm NEW: bank reconcile: checkbox to select all bank operations	2018-03-29 14:49:41 +02:00
Alexandre SPANGARO	6e27da605a	Add label project in tooltip in customer/supplier list	2018-03-27 21:41:25 +02:00
John	88fab15c60	Change situation display	2018-03-23 17:12:09 +01:00
Marc de Lima Lucio	50790d5527	NEW: formconfirm in javascript	2018-03-23 16:54:33 +01:00
John	6a676ea49e	fix percent	2018-03-23 12:24:47 +01:00
Laurent Destailleur	171ad5dce2	Enhance code for template invoices	2018-03-22 21:42:19 +01:00
Laurent Destailleur	9980a5fbd0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog	2018-03-22 14:08:43 +01:00
John	b4983d0e6d	FIX invoice filter	2018-03-22 11:37:16 +01:00
John	fd86e90df2	Add create creadit note btn	2018-03-22 11:19:39 +01:00
Laurent Destailleur	227b830aa2	Fix visible rounding of abandonned amount	2018-03-22 09:41:30 +01:00
John	f91fe41f45	prepare invoice selection and calculation	2018-03-19 15:50:56 +01:00
Laurent Destailleur	12068f9cf3	Merge branch 'develop' into 8.0-a7	2018-03-19 12:18:18 +01:00
Laurent Destailleur	d4ae0395ed	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
Laurent Destailleur	07fb29f0c4	Fix var not initialized	2018-03-16 12:18:20 +01:00
Laurent Destailleur	1716ac5f44	Fix var not initialized	2018-03-16 01:05:49 +01:00
Laurent Destailleur	98b7d4c2e2	NEW Can set the start/end date of service line in invoice templates	2018-03-12 12:27:40 +01:00
Laurent Destailleur	93f4d6fdcd	Translation	2018-03-11 21:34:38 +01:00
Laurent Destailleur	390618db47	Fix bad space	2018-03-10 22:42:28 +01:00
Laurent Destailleur	bdb6a09762	Fix phpcs	2018-03-10 22:41:57 +01:00
Laurent Destailleur	b0bd8cf910	Update facture.class.php	2018-03-10 12:56:19 +01:00
florian HENRY	40fb803ffd	scrunitizer	2018-03-10 09:34:33 +01:00
florian HENRY	63fb53159c	fix scrunitizer	2018-03-10 01:12:47 +01:00
Laurent Destailleur	20ec269d4d	Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink 7.0 betterthirdpartylink	2018-03-09 23:03:23 +01:00
Laurent Destailleur	d8d13a7348	Merge branch 'develop' into 7.0_fix_invoicelist	2018-03-09 22:37:20 +01:00
florian HENRY	a34709c112	fix better thirdparty link	2018-03-09 22:36:00 +01:00
florian HENRY	164ca682d5	fix add "late" invoice into "save last search/backtolist" feature	2018-03-09 17:23:43 +01:00
Regis Houssin	82057b3523	Fix: use code instead id	2018-03-09 08:11:02 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Regis Houssin	861a831e24	Fix: debug	2018-03-08 11:53:46 +01:00
Regis Houssin	fd9c79fa7f	Fix: use getEntity if no rowid to compare	2018-03-08 07:42:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Alexandre SPANGARO	0182b724aa	Merge remote-tracking branch 'uptream/develop' into 8.0-a7	2018-03-08 06:53:54 +01:00
Alexandre SPANGARO	3f2aa6a4fb	New : On invoice card, show accounting account linked	2018-03-08 06:52:31 +01:00
Laurent Destailleur	fe45e82e99	Fix use of table llx_c_paiement (param showempty was not used/set)	2018-03-07 19:00:38 +01:00
Laurent Destailleur	c1497b065c	CSS	2018-03-07 14:13:55 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Laurent Destailleur	0cfa19ee09	NEW Online payment of invoice and subscription record the payment automatically.	2018-03-06 00:12:23 +01:00
Laurent Destailleur	d569adea2f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-05 21:46:40 +01:00
Laurent Destailleur	2f9f4d0675	WIP Create payment of member subscription with paypal	2018-03-05 21:46:24 +01:00
Alexis ALGOUD	35002cf93d	Merge branch 'develop' into NEW_price_on_stock_mvt	2018-03-05 17:45:27 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Laurent Destailleur	82fd84fb48	Fix scrutinizer errors	2018-03-04 11:22:43 +01:00
Laurent Destailleur	4137e1cc76	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-02 17:56:30 +01:00
Laurent Destailleur	6bb91dd5d2	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-03-02 17:54:42 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	ee488ed83e	FIX invoice creation fails when next date not defined	2018-02-27 20:24:50 +01:00
Laurent Destailleur	f3c9d38f82	FIX invoice creation fails when next date not defined	2018-02-27 20:23:55 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Laurent Destailleur	75cbc466d5	Fix warning	2018-02-27 19:08:38 +01:00
Laurent Destailleur	b090f0da9c	Fix warning	2018-02-27 19:07:58 +01:00
Laurent Destailleur	1907b9c52d	Fix search on dates on template invoices	2018-02-27 19:04:21 +01:00
Laurent Destailleur	7ba263c9ab	Fix search on dates on template invoices	2018-02-27 19:03:14 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
gauthier	4d05bff780	FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back	2018-02-27 12:27:25 +01:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Laurent Destailleur	4866d63ece	Fix method getListOfPayments in the wrong class	2018-02-26 09:45:15 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	7ff94c88bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-25 15:00:31 +01:00
Laurent Destailleur	251136bebf	Fix PHPUnit	2018-02-25 15:00:14 +01:00
Laurent Destailleur	502f219f7f	Merge pull request #8231 from hregis/7.0_entity FIX missing object entity in fetch	2018-02-25 12:59:38 +01:00
Regis Houssin	703d976b3b	Fix: missing object entity in fetch	2018-02-24 16:21:16 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Laurent Destailleur	0a79550f43	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +01:00
John	3b54afc9b2	Fix type lines import	2018-02-23 12:12:36 +01:00
John	c5b96e43c7	add new action to import order in invoice	2018-02-22 16:55:41 +01:00
John	a7a6630fad	Add popin dialog	2018-02-22 15:19:20 +01:00
Laurent Destailleur	b87feab1e3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-02-22 12:19:20 +01:00
Laurent Destailleur	bc0993d6cd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-22 12:17:25 +01:00
John	3c1803f1f2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 17:44:08 +01:00
John	f313fb925b	Add new checkbox for lines	2018-02-21 17:06:40 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
John	bd0e8506f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-02-21 11:53:16 +01:00
John	629b8e618e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 11:45:23 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Marc de Lima Lucio	d3f848b7bc	FIX: supplier credit notes: harmonize discount filters part 2	2018-02-21 09:30:39 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger _MODIFY must be called when editing a property event extra. Clean duplicate trigggers "_CLONE"	2018-02-20 18:09:38 +01:00
John	09c5dc506a	Add html dom element and fix class	2018-02-20 17:46:32 +01:00
John	5624257a6d	add new dom html5 elements and class	2018-02-20 16:49:49 +01:00
Laurent Destailleur	7f419a29e7	Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill fix the bill replacement with discounts #8028	2018-02-20 15:19:19 +01:00
John	46b235c139	add auto select model when select type on create invoice	2018-02-20 15:08:57 +01:00
Laurent Destailleur	b361877ea8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/card.php	2018-02-20 12:48:28 +01:00
Marc de Lima Lucio	95be155010	FIX: supplier credit notes: harmonize discount filters	2018-02-20 12:26:29 +01:00
Laurent Destailleur	32e8bab20d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-20 11:01:20 +01:00
Laurent Destailleur	16fca2ee35	Fix bad link	2018-02-20 10:05:11 +01:00
Marc de Lima Lucio	44b0d1ca0f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-19 17:33:20 +01:00
Marc de Lima Lucio	a66f7b8bc8	FIX: supplier credit notes: wrong discount filters	2018-02-19 17:32:59 +01:00
Laurent Destailleur	d233c152a7	Code comment	2018-02-16 14:18:05 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
John	49bad95d31	fix method exist test	2018-02-15 17:04:27 +01:00
John	63987fa32e	fix invoice extrafield transmition to credit	2018-02-15 16:39:47 +01:00
Laurent Destailleur	7f8cbc0f62	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/adherents/type.php htdocs/contrat/services.php htdocs/contrat/tpl/linkedobjectblock.tpl.php htdocs/install/upgrade2.php	2018-02-14 22:08:18 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
atm-ph	c690dfb258	Fix apply global progress don't update multicurrency values	2018-02-14 10:15:38 +01:00
Laurent Destailleur	30ba1c1702	FIX #8174	2018-02-12 14:02:51 +01:00
Laurent Destailleur	975608b9d3	FIX #8174	2018-02-12 03:21:04 +01:00
Laurent Destailleur	ab21769aa2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/card.php	2018-02-08 12:58:47 +01:00
Laurent Destailleur	c988d3f1cc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php	2018-02-08 12:53:26 +01:00
Laurent Destailleur	074f4a3b46	Fix class not found when selecting project ref in lists	2018-02-06 00:34:14 +01:00
Laurent Destailleur	85964e02de	Fix css	2018-02-05 12:34:11 +01:00
Laurent Destailleur	5455ab3280	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/projet/card.php	2018-02-04 23:17:09 +01:00
Regis Houssin	8ee1186492	Fix: wrong test	2018-02-04 09:05:35 +01:00
Regis Houssin	c1e6d88442	Fix: use product_type instead special_code	2018-02-04 08:55:51 +01:00
Regis Houssin	38d735341c	Fix: remove lines with special code when convert to reduc	2018-02-02 10:24:16 +01:00
Laurent Destailleur	74a34acf77	Tab vs space	2018-02-01 02:14:17 +01:00
Laurent Destailleur	9c6b6f244c	Fix tooltip on invoice	2018-02-01 01:25:45 +01:00

... 20 21 22 23 24 ...

4182 Commits