8469 Commits

Author	SHA1	Message	Date
Laurent Destailleur	b0fefffcf8	Fix standardize api code	2017-12-28 12:44:15 +01:00
Laurent Destailleur	6676178435	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/contrat/card.php	2017-12-28 09:56:40 +01:00
Laurent Destailleur	bbcf70cf4e	Remove spaces	2017-12-28 09:48:41 +01:00
Laurent Destailleur	3ac413084f	Merge branch '6.0' into 6.0	2017-12-28 08:46:22 +01:00
Laurent Destailleur	de305cb3b2	Merge pull request #7980 from hregis/6.0_bug2 ... Fix: avoid php warning	2017-12-28 06:53:09 +01:00
Ferran Marcet	1c7b99d3dc	Fix: Missing include for Project class	2017-12-26 12:13:35 +01:00
Laurent Destailleur	493669e986	Fix look and feel v7	2017-12-22 14:19:12 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
Laurent Destailleur	eab44f62b1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2017-12-21 14:35:33 +01:00
Laurent Destailleur	6a62e13960	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
Laurent Destailleur	9ea2fe226d	Fix look and feel v6	2017-12-20 19:30:30 +01:00
Laurent Destailleur	9d10eb57f2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php	2017-12-20 13:28:41 +01:00
Regis Houssin	2821459894	Fix: avoid php warning	2017-12-20 11:36:51 +01:00
Laurent Destailleur	d51ae72eb4	Merge pull request #7965 from Oeris/develop-api ... NEW improvements of invoices, orders and proposals in the REST API	2017-12-19 18:17:48 +01:00
Laurent Destailleur	57603e3df4	Update api_invoices.class.php	2017-12-19 18:16:39 +01:00
Laurent Destailleur	bffed79132	Update api_invoices.class.php	2017-12-19 18:06:05 +01:00
Laurent Destailleur	29b9fb6f54	Merge pull request #7964 from aspangaro/8.0-a1 ... NEW : Add search on date and accounting account in various payment list	2017-12-19 17:58:26 +01:00
Neil Orley	a3f4066790	NEW Update bank account when updating an invoice ... Add the ability to update the bankaccount when updating an invoice	2017-12-19 14:14:26 +01:00
Neil Orley	fe8fac9577	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-19 12:36:46 +01:00
Laurent Destailleur	fcf04c122f	Fix phpcs	2017-12-19 00:39:01 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales ... representatives	2017-12-18 16:13:05 +01:00
Neil Orley	ee6b0d7237	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-18 14:36:29 +01:00
Laurent Destailleur	98b82d712a	NEW Revenue stamp can be a percent ... FIX Revenue stamp not visible on the transfer payment page	2017-12-18 12:43:03 +01:00
Laurent Destailleur	8e12551f17	Fix not employee must not appear on page to create salaries	2017-12-18 11:55:34 +01:00
Laurent Destailleur	a020dbf3d7	Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note ... Fix since jquery 3 we can check all checkbox of credit note options	2017-12-16 01:13:55 +01:00
Laurent Destailleur	9cdf322bfb	Fix scrutinizer bugs	2017-12-15 22:14:28 +01:00
Laurent Destailleur	8bb89f6bf4	Fix look and feel v6	2017-12-15 17:24:36 +01:00
Laurent Destailleur	5ae13ea9d6	Fix navigation in bank direct debit orders	2017-12-15 17:05:01 +01:00
Neil Orley	e61d625577	FIX error message	2017-12-15 10:02:23 +01:00
Neil Orley	5ae74f8ae1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-15 09:56:02 +01:00
Alexandre SPANGARO	24ae3d5879	NEW : Add search on date and accounting account in various payment list	2017-12-15 07:04:05 +01:00
atm-ph	a2f4afbf88	Fix wrong or missing char for url	2017-12-13 16:17:22 +01:00
atm-ph	46770178d2	Fix since jquery 3 we can check all checkbox of credit note options	2017-12-13 15:24:09 +01:00
Laurent Destailleur	676e5a1bca	Merge pull request #7943 from aspangaro/7.0-b4 ... FIX : Various payment	2017-12-12 14:54:44 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	9314dcb046	Fix regression	2017-12-12 10:13:48 +01:00
Laurent Destailleur	bb7c03906e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/files.lib.php htdocs/societe/list.php	2017-12-11 15:25:09 +01:00
Laurent Destailleur	48499fb506	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-11 15:21:22 +01:00
Alexandre SPANGARO	7b935a96bf	FIX : Various payment	2017-12-11 07:03:37 +01:00
Laurent Destailleur	dbd96d1ac7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/loan/card.php htdocs/loan/class/loan.class.php	2017-12-10 21:46:23 +01:00
Laurent Destailleur	d836d68801	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-10 21:29:35 +01:00
Laurent Destailleur	f7b663379a	Fix PHP 7.2	2017-12-10 21:04:59 +01:00
Laurent Destailleur	3415ce4664	Merge pull request #7938 from aspangaro/7.0-b3 ... FIX : Debug various_payment	2017-12-10 20:59:45 +01:00
Maxime Kohlhaas	12d0928244	Fix display error message when stock not enough on invoice validation	2017-12-10 19:59:56 +01:00
Laurent Destailleur	02d9e93ed4	Fix badge and use of data-html instead of html tag	2017-12-10 15:46:35 +01:00
Laurent Destailleur	4443c0f0a0	Fix style	2017-12-10 15:24:47 +01:00
Alexandre SPANGARO	ac95ccd872	FIX : Debug various_payment	2017-12-10 14:05:36 +01:00
Laurent Destailleur	701ae7d21b	Fix responsive	2017-12-08 20:15:28 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large ... More complete template	2017-12-08 16:15:41 +01:00
Laurent Destailleur	f85e79e250	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php	2017-12-08 13:13:53 +01:00
Laurent Destailleur	b671edb116	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-08 13:10:30 +01:00
Laurent Destailleur	09d3db145b	Merge	2017-12-08 13:10:13 +01:00
Regis Houssin	1b16eb731d	Fix: missing load product translation file	2017-12-08 11:00:23 +01:00
Regis Houssin	1bdffa961f	Fix: wrong translation if multilang activated	2017-12-08 10:41:14 +01:00
Regis Houssin	04327189f7	Fix: access error when user not right to view all customers	2017-12-08 09:41:33 +01:00
Regis Houssin	c4b2c3e697	FIXME $accounts[$bid] is a label !	2017-12-08 09:17:12 +01:00
Regis Houssin	8e1a9064cb	Fix: avoid warning again	2017-12-08 09:00:05 +01:00
Regis Houssin	95fa183fac	Fix: Avoid warning "A non-numeric value encountered"	2017-12-08 08:49:03 +01:00
Laurent Destailleur	98149ae316	Fix regression	2017-12-06 23:31:42 +01:00
Laurent Destailleur	56b0279ed7	Fix translation	2017-12-05 20:46:36 +01:00
Laurent Destailleur	2c19c0a10e	Fix test	2017-12-05 20:16:28 +01:00
Laurent Destailleur	21ba8509c9	Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf ... NEW link project from other company conf	2017-12-05 19:18:07 +01:00
Laurent Destailleur	5ab7fa7422	Fix location on good page	2017-12-05 15:48:24 +01:00
Laurent Destailleur	3a9bf455e2	FIX #7870	2017-12-05 13:38:24 +01:00
Laurent Destailleur	93311e3817	FIX #7885	2017-12-05 12:31:57 +01:00
ATM-Nicolas	bdf1e30ef3	Merge branch 'develop' into 6.0_fix_project_conf	2017-12-05 12:20:48 +01:00
Laurent Destailleur	8019f73f99	Fix: protection to not delete invoice if invoice is in bookkeeping	2017-12-05 10:01:30 +01:00
Laurent Destailleur	9b5f7099f7	Code comment	2017-12-03 19:50:15 +01:00
Laurent Destailleur	1b3680c200	Fix missing css	2017-12-03 12:21:38 +01:00
Laurent Destailleur	11286dee4a	Delete of payment	2017-12-03 11:59:16 +01:00
Laurent Destailleur	1f4a079f01	Fix bug reported by scrutinizers	2017-12-02 15:03:14 +01:00
Laurent Destailleur	38be224665	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-02 14:14:26 +01:00
Laurent Destailleur	29568287ef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-12-02 14:13:44 +01:00
Laurent Destailleur	5fae19b4d6	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-12-02 14:13:29 +01:00
Laurent Destailleur	c7d0e917fb	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-12-02 14:12:43 +01:00
Laurent Destailleur	9cafb08759	Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total ... Fix product type is ignored and can generate a diffrent result with s…	2017-12-02 14:06:25 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
gauthier	f04af6c1b3	FIX : test for filter fk_status	2017-11-29 11:06:33 +01:00
Laurent Destailleur	c1e6d35ca5	Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search ... factorization of extrafields into list	2017-11-28 12:14:47 +01:00
Laurent Destailleur	ef786f2271	Debug accountancy module	2017-11-28 11:31:55 +01:00
Laurent Destailleur	a9d3e90b70	Big debug of accountancy module	2017-11-27 21:53:22 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	807bfbb696	Merge pull request #7867 from frederic34/bank ... info bank	2017-11-27 14:50:00 +01:00
atm-ph	5fef6478a5	Fix wrong calcul_price_total() update	2017-11-27 11:26:41 +01:00
Laurent Destailleur	5bdb7d1b98	Fix line "none" must not be visible if there is lines	2017-11-25 23:28:00 +01:00
Laurent Destailleur	6a9056a924	Fix line "none" must not be visible if there is lines	2017-11-25 23:26:14 +01:00
Laurent Destailleur	e99f190ff1	Save search context on list of template invoices	2017-11-25 15:56:36 +01:00
Laurent Destailleur	dbcb38dd3b	Use short label on table	2017-11-25 15:13:39 +01:00
Laurent Destailleur	1d97dd2bd8	NEW can filter on status of template invoices	2017-11-25 15:08:19 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Frédéric FRANCE	6a91b16995	info bank	2017-11-25 12:13:03 +01:00
Laurent Destailleur	aaf08ade2f	Fix bug reported by scrutinizer	2017-11-25 11:21:31 +01:00
Laurent Destailleur	412c4e335d	Fix method of herited object has same signature than parent	2017-11-25 11:10:52 +01:00
Laurent Destailleur	4f4f929efb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/holiday/class/holiday.class.php	2017-11-24 17:02:14 +01:00
Laurent Destailleur	3db52b5f9e	Debug responsive of v7	2017-11-24 14:23:25 +01:00
Laurent Destailleur	9c22b5f335	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
Laurent Destailleur	5cf21fef05	Use autocompletion on list of taxes	2017-11-23 15:46:52 +01:00
Laurent Destailleur	6a3dc91414	Standardize code	2017-11-23 15:22:32 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = ... Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	5a2fe13958	Fix travis	2017-11-22 21:36:01 +01:00
atm-ph	219e58d0e4	Fix product type is ignored and can generate a diffrent result with situation invoice	2017-11-22 12:15:02 +01:00
ptibogxiv	16e791913f	Fix import date ... fix import date when creation	2017-11-19 21:56:50 +01:00
ptibogxiv	35182066a8	update createfromorder ... lack of 2 fields date_start and date_end not imported from order	2017-11-19 16:25:35 +01:00
Laurent Destailleur	f284cd6c0f	Fix phpcs	2017-11-18 02:15:56 +01:00
Laurent Destailleur	14946a0dfa	Fix sort on status	2017-11-18 02:14:04 +01:00
Laurent Destailleur	a00353f332	Fix link to create invoice from template on list	2017-11-18 02:07:52 +01:00
Laurent Destailleur	fc1441086c	Fix status in template invoice	2017-11-18 02:01:04 +01:00
Laurent Destailleur	03cc685037	NEW Add a status enabled/disabled on recurring invoices	2017-11-18 00:54:23 +01:00
Laurent Destailleur	cf0d67d71c	Generation of pdf become default value	2017-11-17 23:57:32 +01:00
Laurent Destailleur	77a0762fc1	Fix comment	2017-11-17 15:07:32 +01:00
Laurent Destailleur	2f6dfc2387	Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid ... NEW deposits can be converted even if unpaid	2017-11-17 15:05:33 +01:00
Laurent Destailleur	ead629708c	Look and feel v6	2017-11-17 14:57:14 +01:00
Laurent Destailleur	92753273b9	Fix upload api for invoices and bad id for bank account	2017-11-17 11:44:52 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Neil Orley	8e869688f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-11-15 10:42:00 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Neil Orley	9b2611933d	NEW Create an invoice using an existing order ... Create an invoice using an existing order using the REST API	2017-11-14 15:49:09 +01:00
Neil Orley	e513ed09f6	Change the way pa_ht is calculated	2017-11-14 14:43:50 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	1a5bbef266	FIX Locatax were not propagated when cloning order or proposal	2017-11-13 13:07:31 +01:00
Laurent Destailleur	f33182acc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-12 20:49:53 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	d29233f553	Merge pull request #7801 from atm-maxime/fix_multi_vat_deposit ... Fix multi VAT deposit when special lines are in origin document	2017-11-11 18:03:31 +01:00
Laurent Destailleur	cba3a3846f	Merge pull request #7790 from frederic34/facrecmodelpdf ... NEW generate also document when invoice is build from recurring template	2017-11-11 17:42:26 +01:00
Laurent Destailleur	50ed463b9f	Merge pull request #7784 from frederic34/patch-3 ... account number on create bank account	2017-11-11 17:37:29 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Maxime Kohlhaas	22a3721dda	Fix multi VAT deposit when special lines are in origin document	2017-11-11 16:10:06 +01:00
Maxime Kohlhaas	60fcddb9e4	NEW deposits can be converted even if unpaid	2017-11-11 12:07:55 +01:00
Laurent Destailleur	11cc82e6d2	Update doc	2017-11-10 10:15:50 +01:00
Frédéric FRANCE	5621e85c00	comment	2017-11-10 00:26:01 +01:00
Frédéric FRANCE	6f647f8a40	generate doc on cron jobs	2017-11-09 23:39:28 +01:00
Frédéric FRANCE	1ea6df14d0	Update card.php	2017-11-08 11:35:15 +01:00
Frédéric FRANCE	27ace14fb7	Fetch right account	2017-11-07 16:28:51 +01:00
Laurent Destailleur	e7abc92f97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/transfer.php htdocs/core/lib/functions.lib.php	2017-11-06 21:37:19 +01:00
Laurent Destailleur	1d9873e1a9	FIX #7756 Add better error message	2017-11-06 21:17:30 +01:00
Laurent Destailleur	9cc923f317	Fix for ch accounting account.	2017-11-06 21:12:29 +01:00
Laurent Destailleur	ea5dd3eb3d	NEW Add REST API for supplier proposals	2017-11-06 11:06:31 +01:00
Laurent Destailleur	a329f7dc75	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: build/exe/doliwamp/doliwamp.iss htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php	2017-11-05 18:50:14 +01:00
Laurent Destailleur	21a0f11395	Merge pull request #7760 from Oeris/develop-api ... NEW Adds the payment reference to the return of the function getListOfPayements	2017-11-05 18:29:59 +01:00
Laurent Destailleur	d3a0cff30a	Merge pull request #7755 from frederic34/currency ... default currency on propal create	2017-11-05 18:28:40 +01:00
Laurent Destailleur	bac6a434f4	Add link to make a direct download on card	2017-11-04 17:11:58 +01:00
Neil Orley	3ecccadb8b	NEW Adds the payment reference to the return of the function getListOfPayements ... Adds the payment reference to the return of the function getListOfPayements	2017-11-03 13:04:23 +01:00
Frédéric FRANCE	b58df17545	default currency on propal create	2017-11-02 18:14:55 +01:00
Laurent Destailleur	309e83a946	Remove the "add" in addpayment. Action in API is hosted by the method	2017-11-02 16:06:44 +01:00
Laurent Destailleur	36f7f32205	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-02 16:02:24 +01:00
Laurent Destailleur	d70f9e053e	Remove the get in url. The GET is already in the method.	2017-11-02 16:01:13 +01:00
Laurent Destailleur	93ab4cadff	Merge pull request #7753 from Oeris/develop-api ... NEW Add REST API to add payment line to a specific invoice	2017-11-02 15:54:22 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Neil Orley	5febdf7bae	NEW Add payment line to a specific invoice using the REST API ... Add payment line to a specific invoice using the REST API	2017-11-02 15:01:38 +01:00
Frédéric FRANCE	01a3787664	swap llxfooter() and $db->close()	2017-10-31 13:45:13 +01:00
Laurent Destailleur	068f5e32cb	NEW Tooltip for substitutions variables on tooltips on admin pages	2017-10-31 11:17:44 +01:00
Laurent Destailleur	75bbcdf575	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-29 11:29:01 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. ... Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Neil Orley	9a1c684870	FIX wrong paramters name in the usecreditnote method ... Rename 'creditnoteid' with 'discountid' in the URI Rename 'creditId' with 'discountid' in the method	2017-10-27 10:02:17 +02:00
Laurent Destailleur	ee1996ad37	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2017-10-27 01:16:51 +02:00
Laurent Destailleur	740c89365d	Code comment	2017-10-27 00:42:44 +02:00
Laurent Destailleur	6a9837528e	Merge pull request #7703 from Oeris/develop-api ... FIX Data related to customer moved to thirparties api	2017-10-27 00:42:10 +02:00
Laurent Destailleur	f4a06aef3f	Update api_invoices.class.php	2017-10-27 00:36:06 +02:00
Laurent Destailleur	8058712d47	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php	2017-10-26 17:06:11 +02:00
Laurent Destailleur	67208b111d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture.php htdocs/expedition/card.php htdocs/product/list.php	2017-10-26 17:02:40 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Neil Orley	da0a205a10	NEW Deduct an available credit to an existing invoice ... Deduct an available credit to an existing invoice using the REST API	2017-10-25 17:09:37 +02:00
Neil Orley	3e53a2ecff	FIX merging conflict	2017-10-25 14:52:33 +02:00
Neil Orley	ff760eb8d5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-10-25 14:46:44 +02:00
Neil Orley	257acb6679	NEW Insert a discount in a specific invoice using the REST API ... Add ability to insert a discount in a specific invoice.	2017-10-25 14:41:12 +02:00
Neil Orley	ec6a19a123	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api-down-payments	2017-10-25 09:57:53 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	3f4c2b54d7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-24 15:22:59 +02:00
Laurent Destailleur	7b661685cc	Debug modBlockedLog module	2017-10-24 15:22:46 +02:00
Neil Orley	b4c484cf0b	NEW Get available assets of an invoice using the REST API ... Returns a list of paid down-payments, available avoirs, etc. with the payments detail	2017-10-24 14:29:28 +02:00
Laurent Destailleur	576db84445	Merge pull request #7701 from mistraloz/patch-2 ... Feature Request : Name of invoice when they are Draft (instead of "Pr…	2017-10-24 13:06:33 +02:00
Laurent Destailleur	e9d851ef34	Merge pull request #7691 from Oeris/develop-api ... NEW Retrieves available discounts and payments details from a specific invoice	2017-10-24 12:49:55 +02:00
Laurent Destailleur	8592e1b1e8	Update api_invoices.class.php	2017-10-24 12:49:37 +02:00
Laurent Destailleur	b6825703b4	Update api_invoices.class.php	2017-10-24 12:47:15 +02:00
Laurent Destailleur	2a1280c715	Merge pull request #7661 from atm-ph/fix_6_0_no_hook_recap_compta ... NEW External module can interact with the customer summary page	2017-10-24 12:39:31 +02:00
Neil Orley	c34a6db13a	Rename assets with avoirs	2017-10-24 11:53:39 +02:00
Neil Orley	41104de7ce	NEW Get available assets of an invoice using the REST API ... Returns a list of paid down-payments, available avoirs, etc. with the payments detail	2017-10-24 11:47:25 +02:00
Neil Orley	02c8f7f905	Modify rights check in the getPayments method	2017-10-24 11:25:31 +02:00
mistraloz	36adda92c2	Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669 ... Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669 -> Change only the tooltip with ref_supplier or ref_client	2017-10-24 11:17:02 +02:00
Neil Orley	0a43a12420	NEW Get a payment list of a given invoice using the REST API ... Add the getpayments method to retrieve a list of payments of a given invoice	2017-10-24 10:50:38 +02:00
Neil Orley	2a9ddf7437	Remove whitespace	2017-10-23 16:49:00 +02:00
Neil Orley	bd0079b3f1	NEW Retrieve available discounts and payments details from an invoice ... Adds the ability to get availbales discounts and payments details of a specific invoice unsing the REST API.	2017-10-23 16:45:49 +02:00
atm-ph	c8871bffc9	Fix duplicate html id	2017-10-23 09:01:58 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	78ffe15a04	Code comment	2017-10-22 14:03:59 +02:00
Laurent Destailleur	83c1928034	Fix duplicate methods	2017-10-22 12:21:44 +02:00
Laurent Destailleur	c9fceaad3c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/index.php htdocs/fourn/facture/card.php	2017-10-22 04:04:26 +02:00
Laurent Destailleur	728e36f70f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php	2017-10-22 01:43:33 +02:00
Frédéric FRANCE	735f06fd83	FIX #7675	2017-10-21 16:20:06 +02:00
Laurent Destailleur	1202853001	Fix syntax error	2017-10-19 19:12:00 +02:00
Laurent Destailleur	f7556e7ad2	FIX make of link to other object during creation	2017-10-19 19:06:48 +02:00
Laurent Destailleur	d4ade7b935	FIX API to get object does not return data o flinked objects	2017-10-19 17:57:16 +02:00
TuxGasy	9c3805c0d5	Fix anchor after add line	2017-10-19 14:10:58 +02:00
Laurent Destailleur	cb089987ee	Fix code comment	2017-10-19 12:35:15 +02:00
Laurent Destailleur	93d16bf4d7	Fix several fixes in APIs	2017-10-19 12:30:36 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. ... Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
atm-ph	0f35b361bc	Fix can't interact with recap data page	2017-10-19 10:42:11 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Laurent Destailleur	99239cbb38	Add API close to close an order	2017-10-18 15:34:03 +02:00
Laurent Destailleur	d40dda83cf	Add API "close" for proposals ... Standardize code	2017-10-18 11:10:08 +02:00
Laurent Destailleur	d70c215ab8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/bankentries.php htdocs/fourn/facture/card.php	2017-10-17 11:14:58 +02:00
Laurent Destailleur	81e7f45200	FIX Stats on invoices show nothing	2017-10-17 11:08:49 +02:00
Laurent Destailleur	5937fba373	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-10-17 10:51:11 +02:00
Laurent Destailleur	8b140ab069	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-17 10:44:29 +02:00
Laurent Destailleur	ebe0664aff	Merge branch 'develop' into scrutinizer-patch-3	2017-10-16 20:54:15 +02:00
Laurent Destailleur	3b1b83a046	Look and feel v6	2017-10-16 20:53:23 +02:00
Laurent Destailleur	0b83513fe0	Merge pull request #7635 from papoteur-mga/develop ... Add Autofill button for amount to pay in charge payment page	2017-10-16 20:26:53 +02:00
Laurent Destailleur	45ac8367bd	NEW Add API for contracts	2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer	bd5bffa72c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-16 06:47:05 +00:00
Papoteur	75835dd7fd	Add Autofill button for amount to pay in charge payment page	2017-10-15 13:33:48 +02:00
Laurent Destailleur	b491d22c16	FIX selection of thirdparty was lost on stats page of invoices	2017-10-14 02:30:33 +02:00
Laurent Destailleur	56e27d785a	CSS on report	2017-10-14 01:03:59 +02:00
Laurent Destailleur	b90770c30c	NEW Can rename (so reorder) bank receipts	2017-10-13 23:38:57 +02:00
Laurent Destailleur	d06f260b94	Fix amount format	2017-10-13 23:13:26 +02:00
Laurent Destailleur	07d16afe3b	Save one space	2017-10-13 23:10:40 +02:00
Laurent Destailleur	c014786446	NEW On reconciliation, show balance including all reconciliated fields	2017-10-13 23:07:27 +02:00
Laurent Destailleur	4296df45af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php	2017-10-13 22:01:56 +02:00
Laurent Destailleur	4b43faf0c1	Fix lose filter	2017-10-13 21:44:38 +02:00
Laurent Destailleur	5a4480bd1d	Fix navigation on bank receipts	2017-10-13 21:32:14 +02:00
Laurent Destailleur	afd83a4454	Fix navigation on bank receipts	2017-10-13 21:25:27 +02:00
Laurent Destailleur	c28dec8dc2	Fix balance no more visible	2017-10-13 21:04:20 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	d12019d1b5	Fix from scrutinizer	2017-10-13 13:10:36 +02:00
Laurent Destailleur	7c9993ef0e	Various fixes	2017-10-13 12:14:57 +02:00
Laurent Destailleur	857b59409c	FIX sql syntax error because of old field accountancy_journal	2017-10-13 01:50:00 +02:00
Laurent Destailleur	558f261b60	FIX #7593	2017-10-13 01:03:33 +02:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	45b4572ad4	Label shorter	2017-10-12 13:30:28 +02:00
gauthier	1e7676d26f	FIX : wrong key in selectarray	2017-10-12 09:30:04 +02:00
Laurent Destailleur	ca0af5cddf	NEW Bulk action validate on customer invoices	2017-10-12 02:25:17 +02:00
Laurent Destailleur	1d92e80788	Fix line addr in xml sepa file	2017-10-12 02:07:51 +02:00
Laurent Destailleur	08c94f11b6	FIX SEPA file if address is empty	2017-10-12 01:44:26 +02:00
Laurent Destailleur	dd15884f83	Fix recur - rcur	2017-10-12 01:35:04 +02:00
Laurent Destailleur	7c29bb5818	Fix must use differently FRST and SEPA	2017-10-12 01:24:19 +02:00
Laurent Destailleur	5f401839d6	Fix verif	2017-10-12 00:42:48 +02:00
Laurent Destailleur	15bcbc8b43	FIX Check on bank info for sepa must be done on iban/swift not on ban	2017-10-12 00:38:59 +02:00
Laurent Destailleur	31ab73ff3c	Fix when verif is called several times	2017-10-12 00:12:26 +02:00
Laurent Destailleur	56e437a6c3	Bed fetch	2017-10-12 00:03:24 +02:00
Laurent Destailleur	5715f44fe6	Better error messages	2017-10-12 00:02:24 +02:00
Laurent Destailleur	d36af4a46a	RUM number start with RUM-	2017-10-11 23:06:23 +02:00
Laurent Destailleur	b4018846e8	Merge pull request #7610 from atm-arnaud/FIX_search_conciliated_bankentries ... FIX bankentries search conciliated if val 0	2017-10-11 11:54:21 +02:00
arnaud	fd796723f2	FIX bankentries search conciliated if val 0	2017-10-10 17:15:01 +02:00
Laurent Destailleur	084dc7798d	Standardize use of function getCommonSubstitutionArray	2017-10-09 14:51:42 +02:00
Laurent Destailleur	8f24a86352	NEW If max nb of generation is reached, date for next gen is striked	2017-10-09 14:16:22 +02:00
Laurent Destailleur	4c23363400	Fix creation of tax payment	2017-10-07 21:27:18 +02:00
Laurent Destailleur	ad0fa3c33a	Look and feel v6	2017-10-07 21:13:54 +02:00
Laurent Destailleur	8aa924fa08	NEW The bank account is visible on payment of taxes	2017-10-07 21:03:46 +02:00
Laurent Destailleur	e40bffb0d5	Fix bug reported by scrutinizer	2017-10-07 20:21:47 +02:00
Laurent Destailleur	af1d2bfffd	Standardize code	2017-10-07 14:11:01 +02:00
Laurent Destailleur	762879b95b	Merge pull request #7586 from Dolibarr/scrutinizer-patch-1 ... Scrutinizer Auto-Fixes	2017-10-07 13:39:39 +02:00
Laurent Destailleur	1b399dc8dd	Update api_invoices.class.php	2017-10-07 13:28:04 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Neil Orley	925a86b2ba	NEW Delete a line of invoice using the REST API ... Adds the ability to delete a line of an invoice using the REST API Rename a post action with a "verb"	2017-10-06 20:49:58 +02:00
Laurent Destailleur	f9d9642340	FIX #6981	2017-10-06 14:07:28 +02:00
Laurent Destailleur	06b18a740e	NEW Add date of birth on user card. ... NEW Show expected worked hours on the timesheet form.	2017-10-06 12:08:01 +02:00
Laurent Destailleur	7b1fe6e5af	Look and feel v6	2017-10-06 11:02:44 +02:00
Laurent Destailleur	d28188d19d	FIX Generation of invoice from bulk action "Bill Orders" ... Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2017-10-04 14:31:52 +02:00
Laurent Destailleur	a74d6074a3	FIX Generation of invoice from bulk action "Bill Orders"	2017-10-04 14:27:10 +02:00
Laurent Destailleur	436ec93084	FIX is_erasable report bad value when thirdparty was not loaded	2017-10-04 03:22:41 +02:00
Laurent Destailleur	a6cf934973	Add log	2017-10-04 02:46:01 +02:00
Laurent Destailleur	3a41f2bddb	Fix test when numbering ref is only numeric char.	2017-10-04 01:27:19 +02:00
Laurent Destailleur	c08f33507f	More accurate error code	2017-10-04 00:51:25 +02:00
Laurent Destailleur	8794e54eba	Try to fix phpunit	2017-10-03 22:52:57 +02:00
Laurent Destailleur	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Laurent Destailleur	f2e0ff0d30	Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict	2017-10-03 17:25:01 +02:00
Laurent Destailleur	b40012d08f	Merge pull request #7535 from Oeris/develop-api ... NEW Set invoices as draft using the REST API	2017-10-03 16:46:12 +02:00
Laurent Destailleur	2b2832da22	Add option FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES - Close #7548	2017-10-03 16:38:22 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
Laurent Destailleur	9d6498f2a4	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
Regis Houssin	e65b21a3bf	Fix: change the parameter value of dol_getIdFromCode	2017-10-02 11:59:17 +02:00
Neil Orley	503129c9f4	Rename method draft and paid to settodraft and settopaid	2017-10-02 11:51:54 +02:00
Regis Houssin	09e71f1390	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-10-02 11:51:27 +02:00
Neil Orley	5b91a6a37b	NEW Sets an invoice as paid using the REST API ... Adds the ability to set an invoice as paid using the REST API	2017-10-02 11:17:46 +02:00
Neil Orley	91a1d6c17e	NEW Set invoices as draft using the REST API ... Adds the ability to set an invoice status as draft using the REST API Change response when validating an invoice: before returned 200 + text message, now returns an invoice object	2017-10-02 10:55:34 +02:00
Laurent Destailleur	884fc5d249	Update facture.class.php	2017-10-02 01:25:00 +02:00
Laurent Destailleur	3f3a5e0921	Merge pull request #7499 from atm-gauthier/NEW_custom_meteo ... New custom meteo	2017-10-02 00:48:52 +02:00
AXeL-dev	46800afac9	FIX: missing variables in payment form	2017-10-01 18:38:08 +01:00
AXeL-dev	5df0f4c2fd	FIX: in payment form, label does not fill with GET method	2017-10-01 18:33:22 +01:00
Laurent Destailleur	fa6c3eff80	More PHPunit on invoice deletion	2017-09-30 12:53:24 +02:00
Regis Houssin	4a63e6b6ec	Fix: two errors when you create invoice from shipping	2017-09-29 19:07:13 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
Laurent Destailleur	be60e66d62	Uniformsize code/options	2017-09-27 16:29:33 +02:00
Laurent Destailleur	f1a563625b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-09-26 22:11:00 +02:00
Laurent Destailleur	7178bf0132	Work on direct external link for dolibarr objects	2017-09-26 16:56:33 +02:00
gauthier	d270a8e009	FIX : same than precedent commit	2017-09-26 16:09:40 +02:00
gauthier	8de9c5cd36	FIX : forgotten php doc on function parameter	2017-09-26 14:18:26 +02:00
gauthier	7f938bc517	NEW : unexistant function load_state_board() on several objects	2017-09-26 12:32:58 +02:00
Laurent Destailleur	49982b36ac	FIX #7490	2017-09-26 11:55:19 +02:00
Laurent Destailleur	dc362fcd30	NEW Can show currency in list of bank accounts	2017-09-25 18:11:03 +02:00
Laurent Destailleur	fcdbc66bb1	Merge pull request #7122 from atm-florian/develop_fixtransfert ... NEW : Can transfer from bank account to bank account with different currencies	2017-09-25 17:36:52 +02:00
Regis Houssin	d592664150	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-09-25 06:48:26 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Laurent Destailleur	3f9cae745c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-24 23:40:57 +02:00
Laurent Destailleur	af384f14ae	FIX #7477	2017-09-24 23:40:42 +02:00
Laurent Destailleur	934edd9f5a	Merge branch 'develop' into 6.0-api	2017-09-24 22:01:07 +02:00
Laurent Destailleur	ddefdd12fb	Merge pull request #7460 from dvasseur/develop ... FIX: REST API, date field not used for invoices creation	2017-09-24 21:56:41 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Neil Orley	9498fca5e1	Add of implementation notes with an exemple	2017-09-22 12:24:42 +02:00
Neil Orley	1aedc4a793	Change the term 'order' by 'invoice'	2017-09-22 12:18:11 +02:00
Neil Orley	ad6778a1cf	NEW post lines of an invoice using the REST API ... Adds the ability to post a new lins in an invoice using the REST API	2017-09-22 12:08:11 +02:00
Neil Orley	f985b1ede6	NEW GET lines of an invoice in the REST API ... Adds the ability to get lines of an invoice using the REST API	2017-09-22 12:00:54 +02:00
Laurent Destailleur	bd45ea5a03	Split page for invoice template into card + list. Add more filters.	2017-09-22 11:28:53 +02:00
Laurent Destailleur	9875d20eaf	Add more columns in list of invoices templates	2017-09-21 18:35:47 +02:00
David	9dab694bb0	FIX: REST API, date field not used for invoices creation	2017-09-21 17:48:12 +02:00
Laurent Destailleur	68c9d08909	Merge pull request #7438 from fappels/6.0_fix_extrafields_copy ... FIX extrafields copy situation invoice, shipment and receipt	2017-09-20 17:36:48 +02:00
Laurent Destailleur	577c64cc37	WIP work on param download on payment page	2017-09-20 17:23:36 +02:00
Laurent Destailleur	04e1458a3f	Fix clean parameters	2017-09-19 22:03:44 +02:00
Laurent Destailleur	8dfa87fcf6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-19 19:30:28 +02:00
Laurent Destailleur	6a0ef4b561	Fix info ot total in direct debit page	2017-09-19 19:29:00 +02:00
Laurent Destailleur	f87614e2d3	Fix missing translation	2017-09-19 19:12:54 +02:00
Laurent Destailleur	ffe2ee8232	Standardize code	2017-09-19 19:00:28 +02:00
fappels	8123562ded	Fix extrafield copy next situation invoice	2017-09-19 18:42:29 +02:00
Laurent Destailleur	f936b17d68	FIX Protection to avoid to apply credit note discount > remain to pay	2017-09-19 00:24:52 +02:00
Laurent Destailleur	9838199de1	FIX Sign of amount in origin currency on credit note created from lines	2017-09-18 23:53:17 +02:00
Regis Houssin	a03ef95eaa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/tables/llx_c_payment_term.sql	2017-09-18 09:11:04 +02:00
Laurent Destailleur	291a0d46e6	Fix edit of categories	2017-09-18 01:39:39 +02:00
Laurent Destailleur	3f7b705674	Use correct term accounting for codes	2017-09-18 00:48:09 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Laurent Destailleur	e014ac6ea9	NEW Send by email available in bulk for expense report	2017-09-16 22:03:25 +02:00
Laurent Destailleur	b4eab24490	Add project into list of customer orders	2017-09-16 20:32:28 +02:00
Laurent Destailleur	0fec777d0e	NEW On bulk email from a list, can uncheck "Join main document". ... NEW Show direct preview link on contract	2017-09-16 18:31:30 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	e56b41c1ae	Clean code	2017-09-16 13:28:13 +02:00
Laurent Destailleur	ad40d27324	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php	2017-09-16 12:22:18 +02:00
Laurent Destailleur	ff7a17eb96	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture.php	2017-09-16 12:17:30 +02:00
Laurent Destailleur	e4767b1a51	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/fiche-rec.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2017-09-16 12:11:18 +02:00
Laurent Destailleur	4e7e6cc658	Fix W3C	2017-09-16 09:15:10 +02:00
Laurent Destailleur	59f644a3e2	FIX SEPA recording payment must save one payment in bank per customer	2017-09-15 18:39:10 +02:00
Regis Houssin	cbd8cb8cb7	Fix: missing merge conflict	2017-09-15 17:32:49 +02:00
Laurent Destailleur	17eec5f9e9	Fix look and field for direct debit notes	2017-09-15 17:23:41 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	f5d2283093	USe second parameter in GETPOST	2017-09-15 10:52:53 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	8392158ee3	Update remisecheque.class.php	2017-09-14 12:06:41 +02:00
Stéphane BERTHELOT	93defa5f59	Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)	2017-09-14 12:06:25 +02:00
Laurent Destailleur	165c3ac112	Merge pull request #7374 from EmisFR/develop ... Fix dates in commande and remisecheque for PostgreSQL	2017-09-14 12:05:51 +02:00
Laurent Destailleur	1cab73b605	Update remisecheque.class.php	2017-09-14 12:05:34 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	38621b622e	Fix specimen not complete for multicompany	2017-09-13 20:11:51 +02:00
Laurent Destailleur	58b49f9a08	Fix position of field to avoid errors	2017-09-13 17:10:23 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
Laurent Destailleur	71ce82b6b9	NEW Better autoselect customer or supplier fields to save clicks	2017-09-12 16:51:10 +02:00
Laurent Destailleur	c5961d8386	Pass user to the delete function	2017-09-12 14:34:33 +02:00
Laurent Destailleur	531ebc4c48	Fix merge	2017-09-12 13:53:55 +02:00
Laurent Destailleur	f411476718	Fix default value of filter	2017-09-12 13:52:19 +02:00
Laurent Destailleur	a4665e17d4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php	2017-09-12 13:26:25 +02:00
Laurent Destailleur	3001ee5fe7	Fix title of reports	2017-09-12 13:05:34 +02:00
Laurent Destailleur	d0a0bf57b6	NEW The "Show detail by account" accepts 3 values: yes, no, if non zero	2017-09-12 12:52:48 +02:00
Laurent Destailleur	627dd15b44	Suggested link for online payment use the generic link	2017-09-12 12:18:26 +02:00
Laurent Destailleur	cda8c6e41a	Fix ref must be 50	2017-09-12 11:51:51 +02:00
Stéphane BERTHELOT	66f671f4c8	Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)	2017-09-11 18:01:24 +02:00
Laurent Destailleur	44405e5415	Fix #7335 #7365 Better fix	2017-09-11 15:04:29 +02:00
Laurent Destailleur	646e8713f2	Remove duplicated logs	2017-09-11 13:41:40 +02:00
Laurent Destailleur	b87ce172c3	FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN	2017-09-11 13:40:34 +02:00
Laurent Destailleur	59ab52c718	FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN	2017-09-11 13:39:03 +02:00
Regis Houssin	b5de8da3a6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/core/modules/modFacture.class.php	2017-09-11 08:07:55 +02:00
Laurent Destailleur	9253207842	NEW template invoices support substition key ... __INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__ __INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__	2017-09-11 02:11:31 +02:00
Laurent Destailleur	26385fa10d	FIX Clean bad parameters when inserting line of template invoice ... Conflicts: htdocs/compta/facture/class/facture-rec.class.php	2017-09-11 01:06:48 +02:00
Laurent Destailleur	86b28a01c7	FIX Clean bad parameters when inserting line of template invoice	2017-09-11 01:04:53 +02:00
Laurent Destailleur	2ae135baf1	NEW Add view of status of template invoice	2017-09-10 20:47:45 +02:00
Laurent Destailleur	e7abb39ee2	NEW Template invoices are visible on the customer tab	2017-09-10 19:28:20 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	03fe9d4e97	Escape all status	2017-09-08 13:23:12 +02:00
fappels	7c743eb7da	Rename $extrafields because already used	2017-09-07 21:04:15 +02:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Regis Houssin	66e548427c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/resultat/clientfourn.php htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-07 10:50:35 +02:00
Laurent Destailleur	7a6f3d899c	Fix initial data	2017-09-06 19:21:46 +02:00
fappels	f5e14c9d70	Transfer of customer order line extrafield should only transfer fields available in target	2017-09-05 21:41:49 +02:00
Laurent Destailleur	48c526f87d	Debug report for accounting module	2017-09-05 12:53:25 +02:00
Laurent Destailleur	f23a681dc0	Clean code	2017-09-05 10:16:08 +02:00
Laurent Destailleur	a0cdf784da	Standardize code	2017-09-05 09:43:22 +02:00
Laurent Destailleur	c1d31c34cd	Work on reports per date	2017-09-05 02:26:23 +02:00
Laurent Destailleur	e1fa37f7ff	Work on reports per date	2017-09-05 02:13:02 +02:00
Laurent Destailleur	987303a6ca	Nb of sql requests divided by 2 from report per personalized categories	2017-09-05 02:12:37 +02:00
Laurent Destailleur	1154f871f1	Update fiche-rec.php	2017-09-04 10:52:49 +02:00
Laurent Destailleur	084ea049d8	Minor bugs	2017-09-03 16:07:21 +02:00
Marcos García	ac7f1035e1	FIX #7325 Default VAT rate when editing template invoices is 0% ... Close #7325	2017-09-03 12:25:27 +02:00
Laurent Destailleur	a3d5d97d05	Fix translation	2017-09-03 02:19:38 +02:00
Laurent Destailleur	cf5c34c8fb	Remove useless link	2017-09-03 02:13:55 +02:00
Laurent Destailleur	7f7b4cddb4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-02 12:37:02 +02:00
Laurent Destailleur	a6a5602572	NEW Can set email of thirdparty as unique and/or mandatory	2017-09-02 12:36:53 +02:00
Laurent Destailleur	c1e54b7e23	Merge pull request #7315 from aspangaro/7.0-f2 ... NEW Add project on a various payment	2017-09-02 00:45:36 +02:00
Laurent Destailleur	9fe5eb3c87	Fix double translation	2017-09-02 00:33:18 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Laurent Destailleur	ac08dec2c3	Avoid warnings	2017-09-01 15:20:29 +02:00
Alexandre SPANGARO	c4d2ca661f	Merge remote-tracking branch 'uptream/develop' into 7.0-f2 ... # Conflicts: # htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-01 07:24:55 +02:00
Alexandre SPANGARO	84fcbb724e	Add project on various_payment	2017-09-01 07:21:27 +02:00
Laurent Destailleur	31a74d448c	Work on accounting reports.	2017-08-31 22:38:30 +02:00
Laurent Destailleur	8248bc1c64	Uniformize code of accounting report	2017-08-31 15:44:36 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Laurent Destailleur	c028771ad0	Merge pull request #7306 from aspangaro/6.0-rc_p2 ... Fix: Bank index | Accountancy journal, fetch on rowid, not code	2017-08-30 16:39:31 +02:00
Laurent Destailleur	d3c95e030b	Fix delete file not possible for external user even with permissions	2017-08-30 14:34:36 +02:00
Alexandre SPANGARO	4998eb3061	Fix: Accountancy journal, fetch on rowid, not code	2017-08-29 21:21:59 +02:00
Laurent Destailleur	945fb61e59	Update facture.class.php	2017-08-29 18:22:01 +02:00
atm-quentin	07f7db1b6d	FIX createFromCurrent lastvalue	2017-08-29 11:22:50 +02:00
Laurent Destailleur	7aa09d8b71	NEW Can create thirdparty from card proposal, order or invoice	2017-08-28 18:37:16 +02:00
Laurent Destailleur	e04dd3c807	Fix php unit	2017-08-27 15:05:35 +02:00
Laurent Destailleur	6c93c6f6cc	Fix PHPunit	2017-08-27 13:38:42 +02:00
Laurent Destailleur	502ac19a0a	Fix regression on categories	2017-08-27 12:28:59 +02:00
Laurent Destailleur	3f7eea2e0a	NEW Can set language on extrafields	2017-08-27 12:12:02 +02:00
Laurent Destailleur	f10e89aa9f	Fix utf8 bom forbidden	2017-08-27 00:33:50 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	782b85ba13	Merge pull request #7285 from hregis/6.0_bug ... Fix: avoid error "A non-numeric value encountered"	2017-08-26 19:31:16 +02:00
Laurent Destailleur	b3f77ed9f7	Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec ... NEW extrafield on facture_rec	2017-08-26 19:26:09 +02:00
Laurent Destailleur	55c4ef7ffc	Merge pull request #7227 from Darkjeff/dev-report ... Dev report from bookkeeping	2017-08-26 19:20:57 +02:00
John	040071b07b	Change copyright comment	2017-08-25 16:25:40 +02:00
John	c9643109df	Fix comment doc	2017-08-25 16:21:34 +02:00
Laurent Destailleur	7d9a18a63d	Fix sql error	2017-08-24 15:39:23 +02:00
John	0653a5d177	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec	2017-08-24 14:35:01 +02:00
Regis Houssin	ad39c30c21	Fix: change old email	2017-08-23 21:23:18 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
Regis Houssin	7da1b215f3	Fix: avoid error "A non-numeric value encountered"	2017-08-23 21:01:14 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	aae24c26a3	Some fixes with smartphones	2017-08-22 20:20:34 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Laurent Destailleur	97dbb40ad6	Fix syntax error	2017-08-22 18:42:35 +02:00
John	b18104788e	New extrafield on facture_rec	2017-08-22 15:22:41 +02:00
Laurent Destailleur	b3d1cdf84c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2017-08-22 10:11:32 +02:00
Laurent Destailleur	9be342bd25	Fix missing $form	2017-08-22 10:02:45 +02:00
Laurent Destailleur	398733ff9a	Fix syntax error	2017-08-17 23:44:16 +02:00
Laurent Destailleur	22a7c9bd6b	Merge pull request #7220 from guerrierk/develop ... NEW|Add possibility to propose last num releve in conciliation	2017-08-17 23:42:07 +02:00
delcroix Patrick	593d06e91e	Reconcile take pqge number into account	2017-08-09 22:24:06 +02:00
Laurent Destailleur	402e6bf650	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/index.php htdocs/compta/paiement/list.php htdocs/core/modules/modCron.class.php	2017-08-04 15:39:00 +02:00
Laurent Destailleur	06e35149f7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-04 15:32:40 +02:00
Laurent Destailleur	7c840b8348	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-04 15:32:30 +02:00
Laurent Destailleur	a7dda865c9	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-08-04 15:29:54 +02:00
Laurent Destailleur	a3beceade2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-08-04 15:28:55 +02:00
Laurent Destailleur	d345b9503a	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-08-04 15:28:03 +02:00
Laurent Destailleur	f8d6eb0d40	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-08-04 15:25:41 +02:00
Laurent Destailleur	86e4207145	Merge branch '6.0' into 6.0-p3	2017-08-04 15:21:41 +02:00
Laurent Destailleur	56426ad3d9	Merge pull request #7228 from aspangaro/6.0-d2 ... Fix v6: SQL error in payment list and remove function length_accountg in bank index	2017-08-04 15:18:43 +02:00
Laurent Destailleur	4cb2a0bce2	Update list.php	2017-08-04 15:17:30 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Marc de Lima Lucio	adbb41799c	FIX: calculate correct remain to pay for planned bank transactions	2017-08-01 11:08:58 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Alexandre SPANGARO	e41543c22e	Fix v6: Debug various_payment	2017-08-01 06:44:37 +02:00
Alexandre SPANGARO	3c34add0d6	remove condition	2017-08-01 06:26:35 +02:00
Alexandre SPANGARO	9629a50853	Fix: SQL error in payment list	2017-08-01 06:21:19 +02:00
Alexandre SPANGARO	efd24cc1a2	Fix: function length_accountg has been moved in getNomUrl	2017-08-01 06:16:23 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	8c287174b0	Merge pull request #7215 from aspangaro/6.0-d1 ... Debug various_payment	2017-07-31 02:32:46 +02:00
Laurent Destailleur	b0adc9cca4	Merge pull request #7207 from atm-quentin/FIX_next_situation_load_extrafields ... FIX next situation keep extrafields	2017-07-31 02:24:46 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
GUERRIER Kevin	b6b3ab3f1b	NEW Add Next/Previous button on operation date of bank line ... Operation date has to be frequently updated because some bank change them in many case. With this feature, this value can be updated simply like the value date.	2017-07-29 15:07:27 +02:00
GUERRIER Kevin	ded6b40489	Add possibility to propose last num releve in conciliation	2017-07-29 14:21:58 +02:00
Laurent Destailleur	60493d0a47	Several fixes (permission, missing method or class) in REST APIs	2017-07-28 11:03:30 +02:00
Alexandre SPANGARO	d8c6bc4a67	Fix: informations (Add account & correct tooltip)	2017-07-28 07:42:02 +02:00
Alexandre SPANGARO	5a932f993d	Fix: function length_accountg has been moved in getNomUrl	2017-07-28 07:27:04 +02:00
Alexandre SPANGARO	0e23873945	Fix: SQL error in payment list	2017-07-28 07:18:41 +02:00
Alexandre SPANGARO	66067f980b	Fix: cancel in create mode	2017-07-28 07:00:52 +02:00
Alexandre SPANGARO	95672e3bf0	Merge remote-tracking branch 'uptream/6.0' into 6.0-d1	2017-07-28 06:40:47 +02:00
Alexandre SPANGARO	0e86bfb6d4	Fix : delete function	2017-07-28 06:40:15 +02:00
Laurent Destailleur	ec27eb5b1e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/societe/list.php	2017-07-27 02:09:40 +02:00
Laurent Destailleur	bdfb0b7561	FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes	2017-07-26 21:22:53 +02:00
atm-quentin	09a1118036	FIX extrafields for invoice too	2017-07-26 15:55:50 +02:00
Regis Houssin	89a9049ccb	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-26 15:25:17 +02:00
atm-quentin	29a4900d0b	FIX_next_situation_keep_extrafields	2017-07-26 15:20:31 +02:00
Laurent Destailleur	d0682c76d6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-26 10:12:54 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	abb346651e	Close #6807	2017-07-25 21:27:07 +02:00
Laurent Destailleur	5b9ac2a7a9	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/index.php	2017-07-25 21:11:36 +02:00
Laurent Destailleur	b7c4f1f086	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/compta/facture.php	2017-07-25 21:05:15 +02:00
Laurent Destailleur	764b47cf47	Merge pull request #7202 from atm-florian/dev_depositinvoicemoreexplicit ... NEW : Deposit invoice more explicit in invoice line description	2017-07-25 19:22:42 +02:00
Laurent Destailleur	7838ec6ed8	Merge pull request #7203 from atm-florian/dev_regen_invoice ... NEW : generate invoice PDF on disount application or payment	2017-07-25 19:12:53 +02:00
florian HENRY	d6d454edc8	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:32:27 +02:00
Laurent Destailleur	149e1f9c67	Merge pull request #7195 from atm-florian/6.0 ... fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:31:40 +02:00
florian HENRY	cdcbff2a85	NEW : generate invoice PDF on disount application or payment	2017-07-25 12:20:51 +02:00
florian HENRY	0dba6f3383	NEW : Deposit invoice more explicit in invocie line description	2017-07-25 11:32:41 +02:00
Laurent Destailleur	cba898e2b9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture.php	2017-07-25 10:12:28 +02:00
Laurent Destailleur	fdcc067c23	Fix regression. Restore lost link "Other invoices".	2017-07-25 10:02:56 +02:00
Laurent Destailleur	aa9b4ce1f3	Fix too long combo for tags	2017-07-25 09:49:08 +02:00
florian HENRY	b9d5f4ba10	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-24 09:02:32 +02:00
Laurent Destailleur	25b107defb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 19:09:00 +02:00
Regis Houssin	2efb86b5d8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-23 10:36:14 +02:00
Laurent Destailleur	764c7ac792	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/websites/index.php	2017-07-22 20:46:02 +02:00
Laurent Destailleur	854a6ca3d5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-22 16:40:45 +02:00
Laurent Destailleur	9e6666e511	Fix translation keys for taxes	2017-07-22 16:40:19 +02:00
Laurent Destailleur	6470b62f56	Fix bad rounding	2017-07-22 16:13:21 +02:00
Laurent Destailleur	5207b84e8b	Fix compatibility with indian IGST/CSGST/SGST	2017-07-22 01:56:38 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	d07741ada1	Merge branch 'develop' into patch-rib	2017-07-21 14:58:33 +02:00
Darkjeff	dcc3febf6f	add bookkkeeping in report turnover	2017-07-20 18:22:53 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Laurent Destailleur	5e1dbdc608	Update index.php	2017-07-18 14:35:11 +02:00
Articoder InfoSec Team	0179160f6c	Reason: similar change is present elsewhere in the code ... Notes: please review carefully before accepting. patch propagation. manual test run. Reviewed By: https://github.com/dchichkov Cherry picked from: === From 0d62bd704e Mon Sep 17 00:00:00 2001 From: Juanjo Menent <jmenent@2byte.es> Date: Wed, 22 Jun 2016 18:59:51 +0200 Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated	2017-07-18 14:34:57 +02:00
Laurent Destailleur	c10852bea3	Merge pull request #7158 from articoder-infosec/patch-1 ... Reason: similar change is present elsewhere in the code.	2017-07-18 14:33:41 +02:00
Laurent Destailleur	ba660a041c	Update index.php	2017-07-18 14:33:32 +02:00
Laurent Destailleur	a416ec4258	Try to fix travis	2017-07-18 14:25:07 +02:00
gauthier	ccbeb162cf	FIX : Buying prices must always be in positive valueo	2017-07-17 11:27:57 +02:00
phf	885fc3c5b7	Fix lost search value in list if come from thirdparty card	2017-07-17 11:04:48 +02:00
Laurent Destailleur	5c0e581d5a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-16 13:01:07 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	84d76f26f2	Fix missing picto	2017-07-15 21:55:05 +02:00
Laurent Destailleur	75ec7a309c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-15 21:25:14 +02:00
Laurent Destailleur	3cd21ee659	Fix sort order	2017-07-15 21:19:39 +02:00
Laurent Destailleur	bab963ec07	FIX Pagination on the ledger page.	2017-07-15 19:19:12 +02:00
Laurent Destailleur	1735a649e9	Fix permission on salary module	2017-07-15 13:02:41 +02:00
Laurent Destailleur	ab6646d16b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/compta/bank/bankentries.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-07-15 03:54:50 +02:00
Laurent Destailleur	cb87b314be	FIX Maxi debug of journalization of bank journal.	2017-07-15 03:41:07 +02:00
Laurent Destailleur	24ecd48b22	Minor fix	2017-07-15 03:40:37 +02:00
Articoder InfoSec Team	8ef5fcd90a	Reason: similar change is present elsewhere in the code ... Notes: please review carefully before accepting. patch propagation. manual test run. Reviewed By: https://github.com/dchichkov Cherry picked from: === From 0d62bd704e Mon Sep 17 00:00:00 2001 From: Juanjo Menent <jmenent@2byte.es> Date: Wed, 22 Jun 2016 18:59:51 +0200 Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated	2017-07-14 15:57:22 -07:00
Laurent Destailleur	0fc56d2bcd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-14 15:26:03 +02:00
Laurent Destailleur	e551c0a665	Fix autofill of amount on supplier payment page	2017-07-14 15:22:30 +02:00
Laurent Destailleur	3ac85e10c5	NEW Add mass action "validate" on supplier invoices. ... NEW Add date_valid and date_pointoftax on supplier invoices.	2017-07-14 14:40:09 +02:00
Laurent Destailleur	3db7bd7624	Fix look and feel v6	2017-07-13 17:44:12 +02:00
Laurent Destailleur	2b77c9b5c7	FIX #7050	2017-07-13 16:56:36 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-11 19:10:22 +02:00
florian HENRY	262e23bc41	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_fixtransfert Conflicts: htdocs/compta/bank/transfer.php	2017-07-10 13:48:22 +02:00
Laurent Dinclaux	253f7e252d	Fixes local taxes repports by rate	2017-07-10 13:15:14 +11:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	1d35c87c18	Merge pull request #7125 from aspangaro/6.0-fec3 ... Fix some problems	2017-07-07 20:32:27 +02:00
Laurent Destailleur	34d0c79e32	Merge pull request #7124 from fappels/develop_updateline_notriggerflag ... New add trigger disable to updateline functions	2017-07-07 20:30:04 +02:00
Laurent Destailleur	749e5eb7f4	Fix link	2017-07-07 20:24:39 +02:00
Laurent Destailleur	552031799d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-07 19:42:37 +02:00
Laurent Destailleur	b7af0cca63	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/list.php htdocs/holiday/card.php	2017-07-07 19:39:57 +02:00
Laurent Destailleur	a026e1d701	Close #7095	2017-07-07 19:32:03 +02:00
Laurent Destailleur	c459d3aa7a	FIX user that modify not set	2017-07-07 19:23:19 +02:00
Laurent Destailleur	fd5f992be4	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-07-07 19:15:18 +02:00
Laurent Destailleur	4c1b485d47	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/compta/facture/list.php	2017-07-07 19:06:25 +02:00
Laurent Destailleur	d58682c574	Merge pull request #7088 from atm-arnaud/FIX_edit_social_emptying_label ... FIX edit sociale was emptying label	2017-07-07 18:59:10 +02:00
florian HENRY	1c647e2898	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2017-07-07 15:59:41 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
Alexandre SPANGARO	0c5febfb4d	Fix: Accountancy	2017-07-07 06:09:49 +02:00
fappels	6effcb0829	New add trigger disable to updateline functions	2017-07-06 16:26:15 +02:00
florian HENRY	ffb8c684d0	NEW : Can transmer from bank account to bank account with different ... currency	2017-07-06 13:40:26 +02:00
florian HENRY	7f869b4840	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/accountancy/class/accountancycategory.class.php	2017-07-03 14:36:50 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Laurent Destailleur	7ae52d843c	Look and feel v6	2017-07-01 14:23:24 +02:00
Laurent Destailleur	31fe8ebcee	Debug v6	2017-07-01 02:22:08 +02:00
arnaud	ca6ce2ba8b	FIX status were wrong on product referent list	2017-06-30 10:38:54 +02:00
arnaud	f79b72f724	FIX edit sociale was emptying label	2017-06-29 16:57:30 +02:00
florian HENRY	6e8c83b2a9	fix class error (given by eclipse Oxygen version)	2017-06-29 15:47:33 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
arnaud	65b9b70ff8	FIX invoice page list	2017-06-27 15:23:51 +02:00
John	93477c102f	FIX delete linked element on facture rec	2017-06-26 15:44:04 +02:00
Juan Bautista Mesa Roldán	0f5dc90bae	Fixing pages warning when value is null	2017-06-24 16:45:45 +02:00
Laurent Destailleur	534ec0d44a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/bankentries.php	2017-06-24 16:26:29 +02:00
Laurent Destailleur	e79f3715b4	FIX #7048 #6075	2017-06-24 16:21:25 +02:00
Laurent Destailleur	a05bbd651c	Fix translation	2017-06-23 11:09:29 +02:00
Laurent Destailleur	ecae2fc6b6	Fix translation	2017-06-23 11:08:49 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	d78d5d60c4	Fix pgsql ... Fix missing vat rate info.	2017-06-20 01:45:44 +02:00
Laurent Destailleur	cffb368bbd	Merge pull request #7030 from aspangaro/6.0-fec3 ... Fix : Accountancy - Debug and add information in database	2017-06-19 15:02:30 +02:00
Laurent Destailleur	bb2d27280b	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
Regis Houssin	544d051fe3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-19 07:06:57 +02:00
Alexandre SPANGARO	a4de12dd8d	Merge remote-tracking branch 'uptream/develop' into 6.0-fec3	2017-06-18 22:15:36 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-17 12:05:33 +02:00
Alexandre SPANGARO	b240f536b5	Fix : Accountancy - Debug and add information in database	2017-06-17 07:54:35 +02:00
Laurent Destailleur	1c8daf9700	Standardize and debug code of module BlockedLog	2017-06-16 12:46:15 +02:00
Laurent Destailleur	26e80045a6	Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor ... NEW log download or preview event on a validate bill	2017-06-16 11:06:27 +02:00
Laurent Destailleur	f39fb5187a	Fix component to select journal	2017-06-15 20:27:40 +02:00
phf	3333049341	Fix total aren't aligned	2017-06-15 11:11:49 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-14 12:16:10 +02:00
Laurent Destailleur	1b56e4a01c	Fix look and feel v6	2017-06-14 11:28:42 +02:00
Laurent Destailleur	b889db997a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php	2017-06-14 10:48:34 +02:00
phf	d2db5f60a8	Fix css to apply "pair" and "impair" style	2017-06-14 09:42:05 +02:00
Laurent Destailleur	c088ccea32	Fix better management of export of extrafield computed.	2017-06-13 18:50:31 +02:00
alexis Algoud	ef0907d89e	NEW log download or preview event on a validate bill	2017-06-13 15:55:22 +02:00
phf	4c0b0ef4c2	Fix display on situation invoice	2017-06-13 11:29:12 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
Regis Houssin	8b0354cfdf	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-06-11 16:43:31 +02:00
Laurent Destailleur	248c5acff2	Fix remove a FIXME tag.	2017-06-11 16:18:21 +02:00
Laurent Destailleur	5471170a97	Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor ... NEW blockedlog hash and authority	2017-06-11 15:54:47 +02:00
Regis Houssin	d1233755f6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:41:02 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Regis Houssin	cc75916599	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:26:24 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Alexis Algoud	3d5899edf3	final blockedlog init	2017-06-10 09:25:32 +02:00
Laurent Destailleur	4b4b2ad1b7	Merge pull request #6965 from atm-maxime/fix_converttoreduc ... Fix : button convert was still available even if deposit was already …	2017-06-10 00:10:45 +02:00
Laurent Destailleur	9341d5f448	FIX Line of invoices not inserted when using POS module and VAT NPR.	2017-06-09 15:35:27 +02:00
Laurent Destailleur	cc37a7d848	Fix parenthesis	2017-06-09 13:11:34 +02:00
Laurent Destailleur	24eebfeb61	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-06-09 12:57:14 +02:00
Maxime Kohlhaas	92b7914ef3	Fix : button convert was still available even if deposit was already converted	2017-06-09 11:09:06 +02:00
Regis Houssin	58b3d86b49	Fix: errors	2017-06-09 09:40:43 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
Laurent Destailleur	97f9d8a87e	Merge pull request #6957 from aspangaro/6.0-vat2 ... Fix : Missing ref of getNomUrl in AccountLine (Bank)	2017-06-08 10:16:32 +02:00
Alexandre SPANGARO	3827903afb	Merge remote-tracking branch 'uptream/develop' into 6.0-vat2 ... # Conflicts: # htdocs/compta/salaries/card.php	2017-06-08 06:44:48 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Alexandre SPANGARO	a96049d0e6	Spaces!!!	2017-06-07 06:06:53 +02:00
Alexandre SPANGARO	c041fe2165	Fix : Missing ref of getNomUrl in AccountLine (Bank)	2017-06-07 06:03:52 +02:00
Regis Houssin	bfd6116e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
Laurent Destailleur	4bda7fcafc	Merge pull request #6949 from aspangaro/6.0-vat2 ... NEW : VAT payment v6 look and feel	2017-06-06 11:08:50 +02:00
Laurent Destailleur	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Alexandre SPANGARO	e547aa8aee	NEW : VAT payment v6 look and feel	2017-06-05 15:41:33 +02:00
Maxime Kohlhaas	6787d717f9	Update bonprelevement.class.php	2017-06-03 18:23:19 +02:00
Regis Houssin	a25facef7c	Fix: use 0 instead false	2017-06-03 11:49:59 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	7f18dfee0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/build_class_from_table.php dev/skeletons/skeleton_card.php htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/projet/card.php	2017-06-03 01:55:05 +02:00
Laurent Destailleur	3555bd2bd7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php	2017-06-03 01:29:59 +02:00
Laurent Destailleur	37a261587e	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-06-03 01:17:03 +02:00
gauthier	fb252706f9	FIX : situation_progress param default value must be 100 and not 0	2017-06-01 15:42:19 +02:00
Maxime Kohlhaas	0e175ba373	Fix : SEPA XML address should also have dolEscapeXML	2017-06-01 11:48:14 +02:00
Laurent Destailleur	d70c14a411	Update bonprelevement.class.php	2017-05-31 19:07:39 +02:00
Alexandre SPANGARO	21183f91a3	FIX : Vat payment - Sql error / Add information in tooltip / Correct writting in general ledger	2017-05-31 05:27:39 +02:00
Regis Houssin	aa780ea33b	Fix: missing dot	2017-05-30 19:15:37 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Maxime Kohlhaas	510b1aedcf	Fix xml SEPA $ListOfFactures not used and was listing all invoices in each XML line	2017-05-30 16:13:49 +02:00
Maxime Kohlhaas	200f4010d8	Fix special char and size limit in SEPA XML	2017-05-30 16:00:39 +02:00
Laurent Destailleur	ae6c58fb57	FIX #6808	2017-05-29 14:16:09 +02:00
Laurent Destailleur	478349174c	Merge pull request #6902 from aspangaro/6.0-salary ... NEW : Move employee in dol_banner in salaries	2017-05-29 11:47:10 +02:00
Laurent Destailleur	395d361d66	Look and feel v6	2017-05-29 11:38:23 +02:00
Laurent Destailleur	85c3880479	Look and feel v6	2017-05-29 10:58:41 +02:00
Laurent Destailleur	0c5bf21f3a	Merge pull request #6900 from aspangaro/6.0-d1 ... Review expense report - Look and feel v6	2017-05-29 10:56:57 +02:00
Laurent Destailleur	452579150d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/html.form.class.php	2017-05-29 10:43:26 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	b22817c237	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/fiche-rec.php	2017-05-29 10:25:07 +02:00
Alexandre SPANGARO	0d3c5bcfa8	Update documents & info page - better look & feel v6	2017-05-29 06:35:53 +02:00
Alexandre SPANGARO	dad1abd55b	NEW : Move employee in dol_banner in salaries	2017-05-29 06:22:21 +02:00
Alexandre SPANGARO	783cec0d6d	Move to getNomUrl for expense report in bank entries	2017-05-27 07:21:59 +02:00
Alexandre SPANGARO	1711107420	FIX : colspan in bank entries	2017-05-27 07:11:17 +02:00
Alexandre SPANGARO	1f079fac9d	Move html.formventilation.class.php to html.formaccounting.class.php	2017-05-25 06:57:28 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	8301e24261	PHP7 compatibility	2017-05-22 10:40:24 +02:00
Laurent Destailleur	4a085a8cc0	Fix phpunit	2017-05-21 21:21:44 +02:00
Laurent Destailleur	5992175b68	Standardize code between customer and supplier invoice list.	2017-05-21 03:23:44 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	54f9990467	Merge pull request #6836 from atm-ph/fix_deposit_calculation ... Fix wrong calculation	2017-05-20 11:57:05 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
Laurent Destailleur	2f72edca6c	Merge pull request #6853 from grandoc/new_branch_16_05 ... Update code using new css class	2017-05-18 17:51:58 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal ... Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
Laurent Destailleur	a8afa547f0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php	2017-05-17 15:20:17 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
philippe grand	99cc67d123	Update code using new css class	2017-05-16 12:43:16 +02:00
arnaud	c9738aa7ea	FIX doactions hook missing in invoice model page	2017-05-16 11:34:00 +02:00
Laurent Destailleur	cc95e046e5	NEW Can sort customer balance summary on date	2017-05-16 03:34:49 +02:00
Laurent Destailleur	ce84990414	NEW On invoices generated by template, we save if of source template.	2017-05-16 02:46:19 +02:00
phf	3da7b9543d	Fix double quote	2017-05-15 15:10:15 +02:00
phf	f10b77f190	Fix html id 'tablelines' exist twice	2017-05-15 15:05:42 +02:00
phf	d120a391f9	Fix use $numlines instead $i	2017-05-15 10:26:40 +02:00
Alexandre SPANGARO	becd023032	Fix : tooltip on supplier invoice payment	2017-05-15 05:11:00 +02:00
Alexandre SPANGARO	4dc7d5cd8d	Fix : tooltip on bank in customer invoice card	2017-05-14 21:20:35 +02:00
Alexandre SPANGARO	93554b7e30	Typo searchpicto	2017-05-14 21:06:33 +02:00
Alexandre SPANGARO	143c019905	Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-14 08:07:34 +02:00
Laurent Destailleur	1d0e9b0a59	Merge pull request #6828 from atm-alexis/FIX_situation_invoice_allpercent ... FIX situation invoice broken	2017-05-13 20:14:48 +02:00
Laurent Destailleur	57ba598b15	Merge pull request #6771 from aspangaro/6.0-stripe ... New : Module Stripe	2017-05-13 19:55:29 +02:00
Laurent Destailleur	b568877f22	Merge pull request #6829 from grandoc/new_branch_10_05 ... Update code using new css class	2017-05-13 19:47:27 +02:00
Laurent Destailleur	dec602a27b	Merge pull request #6838 from atm-ph/fix_invoice_credit_note_standalone ... Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work	2017-05-13 19:45:42 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	b81de35703	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/contrat/class/contrat.class.php	2017-05-12 15:44:09 +02:00
Laurent Destailleur	419c15ee8e	Fix escaping class	2017-05-12 15:28:10 +02:00
phf	b092b6861a	Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work	2017-05-11 12:48:47 +02:00
Laurent Destailleur	eb4cfc11cb	Fix syntax error	2017-05-11 11:58:16 +02:00
phf	17f37cc9e1	Fix wrong calculation	2017-05-11 11:41:00 +02:00
Philippe Grand	26df028efe	Update bilan.php	2017-05-11 09:17:43 +02:00
Philippe Grand	be6be3e533	Update bilan.php	2017-05-11 09:16:44 +02:00
Philippe Grand	449869c37b	Update bilan.php	2017-05-11 09:15:35 +02:00
Philippe Grand	f231864b3f	Update bilan.php	2017-05-11 09:13:51 +02:00
alexis Algoud	c2f76522eb	fix form inside table	2017-05-11 09:04:14 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	d19d733f95	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-10 23:28:24 +02:00
Laurent Destailleur	0734b99d3a	Fix sql syntax	2017-05-10 23:27:48 +02:00
Laurent Destailleur	7ab151dc0d	Merge pull request #6809 from Gecka-Apps/5.0 ... New-Caledonia uses the same bank accounts patterns than France	2017-05-10 23:02:29 +02:00
Laurent Destailleur	1c7d9b9d9a	Merge pull request #6804 from aspangaro/6.0-multijournal ... New : Accountancy - Add a list to select the bank journal in bank card	2017-05-10 22:46:30 +02:00
Benoit	ec4e416a6c	Fix bug xhen insert new bankline	2017-05-10 22:44:08 +02:00
Laurent Destailleur	33e93e9294	Merge pull request #6801 from benlo06/BUG_ACCOUT_CATEGORIES ... Fix add new line for bank records	2017-05-10 22:43:18 +02:00
philippe grand	b7b16dc632	Update code using new css class	2017-05-10 16:41:19 +02:00
alexis Algoud	bba8f972a1	FIX situation invoice broken ... due to the all percent application form inside addline form	2017-05-10 16:10:14 +02:00
Laurent Destailleur	199b4dfeb5	Merge pull request #6816 from Gecka-Apps/5.0-fixes ... Add local taxes support to predefined invoices	2017-05-10 14:52:23 +02:00
Laurent Destailleur	5e54567558	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php	2017-05-10 13:30:35 +02:00
Laurent Destailleur	3e0fcf5ec2	Fix label "total for this page" on last page.	2017-05-10 11:57:59 +02:00
Laurent Destailleur	383dfc0c96	FIX Pagination of invoices	2017-05-10 11:51:59 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	6d01bd712d	FIX Better sanitizing of search all parameter.	2017-05-09 19:36:10 +02:00
Laurent Destailleur	0b97ee42cf	NEW Can use a credit note into a "down payment/deposit".	2017-05-09 18:15:50 +02:00
Laurent Dinclaux	c88656edb4	Fix PHPDOC comments	2017-05-09 23:59:37 +11:00
Laurent Dinclaux	6cac627117	Add support for localtaxes to predefined invoices	2017-05-09 23:19:16 +11:00
Alexandre SPANGARO	16a41242d3	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-05-08 06:39:14 +02:00
Laurent Dinclaux	8c75fc0e52	New-Caledonia uses the same bank accounts patterns than France	2017-05-07 14:11:47 +11:00
Alexandre SPANGARO	7c4b47f20d	Update works	2017-05-06 08:33:12 +02:00
Alexandre SPANGARO	68aaef2f66	Add list to select journal in bank	2017-05-06 08:06:01 +02:00
Benoit	e28dff19ee	Fix bug xhen insert new bankline	2017-05-05 22:21:46 +02:00
Laurent Destailleur	806157ae40	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 17:52:22 +02:00
Laurent Destailleur	15d20497c8	FIX #6795 #6796	2017-05-05 17:46:22 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	65e03ca3ba	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 12:34:22 +02:00
Laurent Destailleur	68b63927e0	Maxi miscellaneous debug	2017-05-05 12:33:49 +02:00
Laurent Destailleur	5f507dd6ed	Merge pull request #6777 from aspangaro/6.0-accountancy_bank ... Use getnomUrl on bank accountancy number	2017-05-05 10:00:32 +02:00
Laurent Destailleur	82c8cee1ff	Merge pull request #6751 from AlainRnet/patch-5 ... FIX #6614 without html.formprojet.class.php called, not possible create invoice…	2017-05-04 20:58:50 +02:00
Laurent Destailleur	944cd40ef4	Merge pull request #6749 from atm-florian/5.0_fix6614 ... FIX #6614	2017-05-04 13:59:24 +02:00
Laurent Destailleur	3917bdfc79	Fix vat_src_code propagation.	2017-05-02 22:37:43 +02:00
Alexandre SPANGARO	fa4bb4e80a	Remove accounting.lib.php	2017-05-01 21:12:52 +02:00
Alexandre SPANGARO	e1e2481e37	Remove picto	2017-05-01 21:09:09 +02:00
Alexandre SPANGARO	102deccba7	Use getnomUrl on bank accountancy number	2017-05-01 21:06:31 +02:00
Laurent Destailleur	58e2b49b1c	Clean code	2017-04-30 13:49:06 +02:00
Laurent Destailleur	7c2b3b8df0	NEW When down payment is entered, discount to reuse into final invoice ... is automatically created. This save one click into invoice workflow.	2017-04-30 12:55:11 +02:00
Laurent Destailleur	cc8e66d079	FIX Journal code of bank must be visible of accountaing module on.	2017-04-29 15:30:40 +02:00
Alexandre SPANGARO	586ea54bfc	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-29 07:05:02 +02:00
Laurent Destailleur	c722286bcb	Fix regressions	2017-04-28 13:37:36 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Laurent Destailleur	5e856e6923	More complete tooltip help to describe available substitution vars	2017-04-27 17:16:19 +02:00
AlainRnet	d9cdaeb851	without html.formprojet.class.php called, not possible create invoice template ... cf. https://github.com/Dolibarr/dolibarr/issues/6614 without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.	2017-04-24 15:43:36 +02:00
florian HENRY	8f97177dae	FIX 6614	2017-04-24 14:44:44 +02:00
Alexandre SPANGARO	c3fe1c963a	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-22 06:33:31 +02:00
Laurent Destailleur	0994622bf8	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
Alexandre SPANGARO	fed6d71d8a	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-17 06:51:02 +02:00
Juanjo Menent	3308775c06	Merge pull request #6701 from joseplluis/patch-6 ... NEW Show local taxes in facture list	2017-04-16 11:03:59 +02:00
Juanjo Menent	00390bc8e4	Merge pull request #6705 from atm-florian/5.0 ... fix setEventMessages error insteads of errors	2017-04-16 10:19:19 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	ac884ec463	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/install/repair.php	2017-04-15 16:28:08 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
florian HENRY	196156a21e	fix setEventMessages error insteads of errors	2017-04-13 16:35:29 +02:00
Josep Lluís	deb309ab7e	NEW Show local taxes in facture list ... Show localtax1 and localtax2 in facture list, only if they are enabled in company config	2017-04-13 08:30:48 +02:00
Laurent Destailleur	6f4ce8dc2f	Merge remote-tracking branch 'origin/3.9' into 4.0	2017-04-12 14:22:47 +02:00
Laurent Destailleur	d78f3923ee	Support of preview for pdf with several pages	2017-04-12 12:13:38 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	4eaa1d4f46	Add nb of generation into list of template invoices	2017-04-11 20:07:35 +02:00
Laurent Destailleur	2446cb5431	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php	2017-04-11 11:43:54 +02:00
Laurent Destailleur	eb4236011b	Merge pull request #6670 from marcosgdf/bug-6669 ... FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry	2017-04-11 11:15:16 +02:00
Laurent Destailleur	e08b92d913	Merge pull request #6665 from defrance/patch-4 ... Add invoice_rec_prepare_head for reccuring invoice	2017-04-11 11:13:12 +02:00
Marcos García de La Fuente	996b5e9f87	Corrected translation errors and little bug showing a non-available button to a restricted user	2017-04-09 18:17:46 +02:00
Marcos García de La Fuente	411d276ed2	FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry ... Close #6669	2017-04-09 14:29:40 +02:00
BENKE Charlie	54780ff205	Update fiche-rec.php	2017-04-09 11:33:09 +02:00
vvnt	ff75077b34	Fix: bug #6653 situation invoice miscalculation ... Bug (#6653) In price.lib.php (htdocs\core\lib\price.lib.php), the function calcul_price_total() is defined (line 76). The 7th parameter is **$remise_percent_global**. However, this function is called on facture.class.php (htdocs\compta\facture\class\facture.class.php) and the 7th parameter used is **$line->product_type**. Consequently, invoice situation is correct when user sells a product (product_type = 0) and is wrong when user sells a service (product_type = 1). Effectively, in the latter case, the total situation invoice will be wrong by 1%. In order to correct this, we can add 0 as the 7th parameter and move **$line->product_type** to the 10th parameter.	2017-04-08 20:15:14 +02:00
Laurent Destailleur	76af83ce06	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-08 14:06:25 +02:00
Laurent Destailleur	56a4b7a1fd	Work on v6 look and feel	2017-04-08 14:03:38 +02:00
Laurent Destailleur	31f580ad93	FIX Enter a direct bank transaction	2017-04-08 01:25:52 +02:00
Laurent Destailleur	a0e75d0af0	Work on look and feel v6	2017-04-07 18:38:55 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	60a54041c2	NEW Enable bulk actions delete on supplier invoices	2017-04-07 14:09:19 +02:00
Laurent Destailleur	ea44e14b60	Start debug the variant module	2017-04-07 11:01:12 +02:00
Laurent Destailleur	216bce608d	Work on v6 look and feel	2017-04-06 23:28:06 +02:00
Laurent Destailleur	915a74a85f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-06 22:32:05 +02:00
Laurent Destailleur	a99a4be9e0	Work on 6.0 look and feel	2017-04-06 22:31:45 +02:00
Laurent Destailleur	07bbf1a32b	Merge pull request #6648 from delcroip/patch-9 ... NEW : show files in the bank statement + download	2017-04-06 22:31:19 +02:00
Laurent Destailleur	f598bf8bef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:59:11 +02:00
Laurent Destailleur	8363bee234	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:56:48 +02:00
Laurent Destailleur	fe4f71296f	FIX #6636 Complete fix	2017-04-06 21:55:23 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
arnaud	6b2d8a3c34	FIX limit+1 dosn't show Total line	2017-04-06 11:14:15 +02:00
delcroix Patrick	337eac30c1	Update releve.php	2017-04-05 21:14:41 +02:00
delcroix Patrick	ca72e5e19f	NEW : download button	2017-04-05 20:53:41 +02:00
delcroix Patrick	dae0828543	NEW : show files in the bank statement + download	2017-04-05 20:50:18 +02:00
Laurent Destailleur	e8767122b0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/societe/list.php	2017-04-03 11:05:19 +02:00
Laurent Destailleur	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	a2da0dab7d	FIX bank account not visible on payment card	2017-04-02 21:42:16 +02:00
Laurent Destailleur	d975e7f442	Work on 6.0 look and feel	2017-04-01 12:46:47 +02:00
Laurent Destailleur	93687997c9	Work on 6.0 look and feel	2017-03-31 18:40:53 +02:00
Marcos García de La Fuente	2448b9ee55	FIX #6619 Template invoices list do not respect restricted thirdparty user rights	2017-03-30 14:52:26 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
Laurent Destailleur	2f439fed85	Code for 6	2017-03-28 13:31:28 +02:00
Laurent Destailleur	3740137e31	Add tooltip on label of each open item.	2017-03-28 10:44:52 +02:00
Laurent Destailleur	0838953ef7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-27 00:49:24 +02:00
Laurent Destailleur	278bbf184c	Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input ... New : Add Various payment submodule linked to the accountancy to replace free input in bank	2017-03-24 22:52:39 +01:00
Laurent Destailleur	b420b288ca	Merge pull request #6559 from aspangaro/5.0-p2 ... Fix : missing language file in salaries index	2017-03-24 22:44:46 +01:00
BENKE Charlie	2b1c29316f	Display totalLine if one of total field are present	2017-03-24 22:13:58 +01:00
Alexandre SPANGARO	35da94bbc2	Fix : missing language file in salaries index	2017-03-24 06:38:26 +01:00
Laurent Destailleur	38660418b4	Include preview of pdf into dol_banner	2017-03-23 22:27:44 +01:00
Laurent Destailleur	53a04703d6	Uniformize code	2017-03-23 16:10:38 +01:00
Laurent Destailleur	22247271f6	CSS enhancement	2017-03-23 13:19:00 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	7df9c25e60	Several fixes on multicurrency	2017-03-23 12:44:20 +01:00
Alexandre SPANGARO	2bc7f10cd6	Fix	2017-03-21 06:45:13 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php ... to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	80f7bce8d8	Fix duplicate <a>	2017-03-20 20:41:43 +01:00
Alexandre SPANGARO	6d5578a876	Reactivated constant BANK_DISABLE_DIRECT_INPUT	2017-03-19 20:47:30 +01:00
Alexandre SPANGARO	b09398a68e	Update works	2017-03-19 15:23:35 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Alexandre SPANGARO	36f279837f	Update work	2017-03-19 08:17:32 +01:00
Alexandre SPANGARO	e07f934185	Class is missing	2017-03-19 07:26:37 +01:00
Alexandre SPANGARO	504e1e1ec8	Step 3: Work on card	2017-03-19 07:26:15 +01:00
Alexandre SPANGARO	16b12b33fc	First step : remove BANK_DISABLE_DIRECT_INPUT	2017-03-18 07:24:55 +01:00
Laurent Destailleur	7dd0f14563	Fix link to reconciliated function	2017-03-16 21:03:35 +01:00
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
Laurent Destailleur	184d52525a	PHP code to manage pair/impair is replaced by native CSS.	2017-03-07 22:45:22 +01:00
Alexandre SPANGARO	6ce8aa7d6f	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-03-07 22:08:23 +01:00
Laurent Destailleur	4e4045d18a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:12:08 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	2a1060c0fc	Merge pull request #6475 from defrance/patch-87 ... Situation total row left a col if bank enabled	2017-03-05 21:39:02 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if ... there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	29953b46cd	Fix css	2017-03-03 15:32:34 +01:00
Laurent Destailleur	6ee286f5f7	FIX #6404	2017-03-03 15:11:41 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	be86664e43	FIX #6449	2017-03-03 14:27:01 +01:00
Laurent Destailleur	ea08c929c0	FIX #6476	2017-03-03 14:08:19 +01:00
Laurent Destailleur	0dd8db9073	Fix bank account label missing	2017-03-02 01:46:51 +01:00
Laurent Destailleur	d67d83515a	Fix dol_banner usage	2017-03-02 01:40:53 +01:00
Laurent Destailleur	1562df8f93	Fix responsive design	2017-03-02 01:26:15 +01:00
BENKE Charlie	706dd838c9	Situation total row left a col if bank enabled	2017-03-01 11:21:49 +01:00
Alexandre SPANGARO	05e50e1027	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-02-28 05:52:43 +01:00
Laurent Destailleur	821324868a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-27 12:15:31 +01:00
Laurent Destailleur	d5dc88d66b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-27 12:08:18 +01:00
Laurent Destailleur	f579fc6b2d	Code comment	2017-02-27 12:07:38 +01:00
Laurent Destailleur	1be389fd3e	FIX deletion of bank tag	2017-02-27 12:06:45 +01:00
Laurent Destailleur	4572a78618	Fix bad table deleted	2017-02-27 12:03:20 +01:00
Laurent Destailleur	c210b2349d	Fix bad table	2017-02-27 11:59:18 +01:00
Laurent Destailleur	0d07ad8c69	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/bank/card.php htdocs/compta/bank/class/account.class.php	2017-02-27 11:58:35 +01:00
Laurent Destailleur	d9ba06e224	Fix bad table	2017-02-27 11:42:11 +01:00
Laurent Destailleur	10838983b5	FIX error management in bank account deletion.	2017-02-27 11:38:19 +01:00
Laurent Destailleur	024cecec29	FIX Error management during bank account creation	2017-02-27 11:16:46 +01:00
Laurent Destailleur	0f8a8869cb	FIX Error management during bank account creation	2017-02-27 11:15:59 +01:00
Laurent Destailleur	cff284b2f3	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/compta/bank/categ.php	2017-02-27 10:55:18 +01:00
Laurent Destailleur	9ecc56ad4d	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-02-27 10:48:36 +01:00
Laurent Destailleur	3aaf9dae11	Fix parameter to cal cron method	2017-02-27 00:12:48 +01:00
Laurent Destailleur	29578a38bd	Keep previous behaviour if new option not set	2017-02-24 16:19:00 +01:00
Laurent Destailleur	7ee6dc7fa6	Merge pull request #6388 from atm-ph/new_deposit_with_multi_tva_management ... New deposit with multi tva management	2017-02-24 16:16:33 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Alexandre SPANGARO	942b58efaf	New : Integration of Stripe	2017-02-22 06:33:52 +01:00
Laurent Destailleur	19e60f03b9	Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms	2017-02-21 14:17:44 +01:00
Laurent Destailleur	ebe625aa16	Fix debug direct debit module	2017-02-21 13:16:28 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
Raphaël Doursenaud	b697da7399	Fix: [Payments] Properly escape variable for JS ... The company name may contain reserved characters such as a quote which needs proper escaping to prevent upsetting the JavaScript interpreter.	2017-02-17 16:16:41 +01:00
Laurent Destailleur	498473715e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 01:48:43 +01:00
Laurent Destailleur	4c310964a9	Fix list of supplier proposals	2017-02-17 01:41:33 +01:00
Laurent Destailleur	4a8006b330	Fix style	2017-02-16 23:15:47 +01:00
Laurent Destailleur	d72e5a3646	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-10 17:34:23 +01:00
Laurent Destailleur	ca67917e80	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/modFacture.class.php	2017-02-10 17:33:32 +01:00
Laurent Destailleur	d461c0dfa4	Fix left align	2017-02-10 10:47:19 +01:00
Laurent Destailleur	66542b6367	Fix translation and link to direct debit payment	2017-02-10 10:43:54 +01:00
phf	579d350599	Fix keep the standard behaviour	2017-02-09 17:41:06 +01:00
gauthier	c01988ba43	FIX : delete bank class lines when we delete bank_categ	2017-02-09 17:28:37 +01:00
florian HENRY	ab0783edcc	FIX #6234	2017-02-08 17:18:06 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr ... Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	b611c5ca53	Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received ... NEW Develop new reduc on excess received	2017-02-08 11:16:10 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
phf	6b20bad847	add fixme	2017-02-07 11:14:27 +01:00
phf	0f421dc2b4	New global conf MAIN_DEPOSIT_MULTI_TVA to manage multi tva on deposit	2017-02-07 11:09:18 +01:00
Laurent Destailleur	8f52a34e71	Report of supplier payment is name "supplier_payments"	2017-02-06 20:37:42 +01:00
Laurent Destailleur	6cb3199824	Translation message	2017-02-06 12:03:20 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	13f37b2cb9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-02 02:25:49 +01:00
Laurent Destailleur	f6144b9ecb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-02 02:24:57 +01:00
Laurent Destailleur	8f0ddf2b8c	Merge pull request #6342 from simnandez/5.0 ... Fix #6314 Sorting balance error	2017-02-02 01:03:21 +01:00
Laurent Destailleur	18f3e11c10	Merge pull request #6339 from atm-maxime/fix_numbering_display_error ... Fix numbering was disaplying technical error instead of error message	2017-02-02 00:49:18 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	24c21cca27	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-28 15:56:27 +01:00
Laurent Destailleur	4f76626f51	FIX Creation of credit note on invoice with deposit stole the discount.	2017-01-28 15:55:44 +01:00
Laurent Destailleur	fd90bf466b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/societe/soc.php	2017-01-28 15:12:14 +01:00
Laurent Destailleur	c88e63ecc9	FIX #6259	2017-01-28 15:01:17 +01:00
Juanjo Menent	3e14a89eb0	Fix #6314	2017-01-27 23:05:29 +01:00
Maxime Kohlhaas	7b6488b1c7	Fix numbering was disaplying technical error instead of error message	2017-01-27 10:05:57 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	f2f8d7b6a5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-27 01:21:34 +01:00
Laurent Destailleur	9f1959ffc8	Fix MVC Actions must be done before output	2017-01-27 01:21:20 +01:00
Laurent Destailleur	ade8fd1415	Fix table format	2017-01-27 01:20:56 +01:00
florian HENRY	28115689e8	fix : wrong $formproject->select_projects call on model invoice	2017-01-26 08:46:39 +01:00
Quentin Vial-Gouteyron	94b42021bd	fix payment method	2017-01-24 15:15:31 +01:00
Quentin Vial-Gouteyron	6011c98515	FIX payment method exception	2017-01-24 12:22:23 +01:00
Quentin Vial-Gouteyron	39a92df647	Massive withdrawal request	2017-01-24 11:50:07 +01:00
Laurent Destailleur	1878647d26	NEW Add statistics on supplier tab.	2017-01-23 20:54:52 +01:00
Laurent Destailleur	5fd8b1efcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 21:23:35 +01:00
Laurent Destailleur	433ad9d59d	Fix responsive	2017-01-22 13:27:17 +01:00
Laurent Destailleur	66819a34fa	Fix several bugs	2017-01-22 13:19:07 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	ea97491a8f	Merge pull request #6288 from marcosgdf/fr-6280 ... NEW #6280: Generate PDF after creating an invoice from a customer order	2017-01-20 18:11:47 +01:00
Laurent Destailleur	6780b20968	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-20 14:11:55 +01:00
Laurent Destailleur	2f4ff66c43	Minor fixes	2017-01-20 14:10:57 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	3336943ff2	Fix responsive	2017-01-18 15:49:12 +01:00
Laurent Destailleur	d48f2507b5	Fix link attachment on bank document page	2017-01-18 15:37:45 +01:00
Laurent Destailleur	ddbb7ee1f4	Fix bad alignement	2017-01-18 15:26:50 +01:00
Laurent Destailleur	b6383399aa	Fix bad colspan	2017-01-18 15:23:37 +01:00
Laurent Destailleur	8f577b0754	Fix bad link	2017-01-18 15:19:17 +01:00
Laurent Destailleur	6f3677a322	FIX total payed wrong	2017-01-18 13:28:02 +01:00
Marcos García de La Fuente	e0cbcadd98	In case Model for document generation is not defined, the criteria to select the model is now: ... 1. Model for the object 2. Custom default module 3. Hardcoded default module	2017-01-16 21:16:05 +01:00
Marcos García de La Fuente	6dbb3efc89	NEW #6280: Generate PDF after creating an invoice from a customer order ... Close #6280	2017-01-16 20:24:26 +01:00
Laurent Destailleur	c1d6ad90b3	FIX #6255	2017-01-16 12:35:19 +01:00
Laurent Destailleur	43cb9c30b2	Fix var_dump	2017-01-16 12:21:37 +01:00
Laurent Destailleur	c01baf1223	FIX #6255	2017-01-16 12:16:49 +01:00
Laurent Destailleur	a05132d26e	Fix PHP 7.1 error	2017-01-16 09:05:09 +01:00
Laurent Destailleur	94a180a775	Fix POO best practice	2017-01-16 00:54:08 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	6aa26e0f62	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/paiement.php htdocs/product/stock/massstockmove.php htdocs/projet/info.php htdocs/projet/tasks/time.php htdocs/societe/class/societe.class.php	2017-01-13 16:49:18 +01:00
Laurent Destailleur	edb79de54e	FIX javascript error	2017-01-12 18:07:19 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	46e330f749	Merge pull request #6256 from aspangaro/5.0-23 ... Fix : Bank - Presentation, no titlefield in a list	2017-01-12 10:09:38 +01:00
aspangaro	a583fd7a3b	Fix : Bank - Presentation, no titlefield in a list	2017-01-08 20:52:42 +01:00
aspangaro	dc605c915a	Fix : Bank - Missing language file	2017-01-08 07:46:30 +01:00
Laurent Destailleur	febd23fe41	Clean dead code	2017-01-03 11:22:03 +01:00
Laurent Destailleur	f07c741176	Fix missing error message on invoice creation	2017-01-02 11:31:21 +01:00
Laurent Destailleur	d986247e0f	Fix dol_banner	2017-01-01 19:53:05 +01:00
Laurent Destailleur	b642a3a602	Prepare release 5.0	2016-12-31 16:35:56 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Laurent Destailleur	7dd06a1ae6	Fix margin pagination	2016-12-27 02:01:27 +01:00
Laurent Destailleur	6e00d7fee3	Fix date modification not visible	2016-12-27 01:41:04 +01:00
Laurent Destailleur	003045525f	Fix css	2016-12-27 01:32:29 +01:00
Laurent Destailleur	3e28f22bad	Fix style	2016-12-27 00:08:43 +01:00
Laurent Destailleur	bbd3734a21	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/filefunc.inc.php	2016-12-26 12:42:23 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Ferran Marcet	ae7f49b5d8	FIX: Deposits and credit notes weren't added in the received and pending columns	2016-12-21 18:40:05 +01:00
aspangaro	c187f95269	Social contribution : Complete work on dol_banner	2016-12-20 21:59:05 +01:00
Laurent Destailleur	fc401a9c68	Fix more security fixes	2016-12-18 17:27:06 +01:00
Laurent Destailleur	12e919b99d	Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin ... Fix user right write margin	2016-12-18 10:53:34 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
phf	cca7967144	Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin	2016-12-15 16:19:54 +01:00
phf	21a648a052	Fix user right on margin module to write buyprice	2016-12-15 12:01:46 +01:00
Laurent Destailleur	ecab7cb70e	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/class/product.class.php	2016-12-14 12:29:41 +01:00
Laurent Destailleur	6c4f15df63	Fix lot of fix in css look to match v5 rules.	2016-12-11 16:11:42 +01:00
Laurent Destailleur	2dcb97e61d	Continue work on dol_banner	2016-12-11 13:16:21 +01:00
Laurent Destailleur	372f50bbde	FIX Do not show total of balance if currencies differs	2016-12-11 11:51:21 +01:00
Laurent Destailleur	9b436ce871	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/product/class/product.class.php	2016-12-11 02:51:32 +01:00
Maxime Kohlhaas	177ec97689	Actualize currency on propal, order and invoice	2016-12-11 01:04:58 +01:00
Maxime Kohlhaas	d426ab04f0	Multicurrency on proposal and order	2016-12-11 00:42:52 +01:00
Maxime Kohlhaas	466f89930e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug	2016-12-10 22:42:17 +01:00
Juanjo Menent	5a2b8ff53c	FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1	2016-12-10 22:41:53 +01:00
Maxime Kohlhaas	7c82b18da0	New : allow to actualize currency rate	2016-12-10 22:07:25 +01:00
Laurent Destailleur	f21344eee0	Merge pull request #6120 from philippe-opendsi/develop ... FIX : Display invalid message when save payment in invoice currency	2016-12-10 21:58:45 +01:00
Laurent Destailleur	0486815403	Merge pull request #6122 from aspangaro/5.0-b4 ... Bank : Detail of a banking writing more responsive (Remove rowspan)	2016-12-10 21:58:08 +01:00
aspangaro	14ce1bf3a6	Add information on bank payment tab ... Need fk_user_modif and dater in 6.0	2016-12-10 21:52:33 +01:00
Maxime Kohlhaas	1f48e0486f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug	2016-12-10 21:50:31 +01:00
aspangaro	896fbfe2ca	Bank : Detail of a banking writing more responsive (Remove rowspan)	2016-12-10 20:59:25 +01:00
philippe-opendsi	bc2c794484	FIX : Display invalid message when save payment in invoice currency ... Display Payment higher than to pay	2016-12-10 19:57:11 +01:00
Maxime Kohlhaas	6474591e25	Allow to enter price in currency	2016-12-10 19:54:16 +01:00
aspangaro	542499d94e	Fix Social contribution - Missing information in tab information	2016-12-10 15:47:44 +01:00
aspangaro	bc189c0f6a	Responsive	2016-12-10 15:13:24 +01:00
florian HENRY	e61770671a	fix : create project from facture rec and back url wrong	2016-12-10 12:53:58 +01:00
Laurent Destailleur	bd1d076753	Merge pull request #6096 from aspangaro/5.0-b2 ... VAT payment card - Uniformize presentation	2016-12-10 11:44:38 +01:00
gauthier	ef721bebc6	FIX : break with no iteration	2016-12-09 17:48:03 +01:00
aspangaro	b1c007aa75	VAT payment card - Uniformize presentation	2016-12-09 06:59:24 +01:00
aspangaro	b31d5d7f75	VAT - Correct presentation on card	2016-12-08 22:50:03 +01:00
Laurent Destailleur	49f5ec6b52	Fix bugs reported by scrutinizer	2016-12-07 19:12:25 +01:00
Laurent Destailleur	1838670e31	Fix several security holes on api when used by external users	2016-12-07 19:02:39 +01:00
fappels	b918d7abc9	fix travis	2016-12-05 19:20:46 +01:00
fappels	7776ae6da4	Fix travis	2016-12-05 19:19:48 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
Laurent Destailleur	4b831537e5	Fix several problem in notes management of template invoices.	2016-12-04 21:27:08 +01:00
Laurent Destailleur	81a3235cf6	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/list.php htdocs/fourn/facture/card.php htdocs/fourn/facture/list.php	2016-12-03 16:01:18 +01:00
Laurent Destailleur	7a3b309013	Fix width	2016-12-03 15:22:26 +01:00
Laurent Destailleur	e846d74654	Fix sort on invlice list	2016-11-30 15:19:16 +01:00
Laurent Destailleur	4bff869507	Merge pull request #6056 from aspangaro/5.0-p38 ... Presentation of social contribution	2016-11-29 23:22:58 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
aspangaro	953feefb6a	Social contribution in adaptive mode (Payment are under the information)	2016-11-29 06:43:16 +01:00
aspangaro	d73c24bb45	Social contribution in adaptive mode (Payment are under the information)	2016-11-29 06:34:20 +01:00
Laurent Destailleur	83972b39ce	Complete work on dol_banner. Fix errors due to missing columns.	2016-11-28 23:58:36 +01:00
aspangaro	fc0edc3499	Uniformize presentation of social contribution - Add button cancel in create mode	2016-11-28 21:27:02 +01:00
Laurent Destailleur	4eb397557f	Debug accounting module	2016-11-28 19:30:55 +01:00
Laurent Destailleur	6e43910932	FIX Filter was wrong or lost during navigation	2016-11-28 18:38:48 +01:00
gauthier	d8aa572ad7	FIX : fetch discount desappeared in develop...	2016-11-28 17:38:20 +01:00
gauthier	34a123759f	Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received	2016-11-28 17:13:35 +01:00
gauthier	9a1309256d	Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received	2016-11-28 17:13:09 +01:00
gauthier	3f6f1ac86f	fix : where fk_facture = object id	2016-11-28 17:12:17 +01:00
Laurent Destailleur	e59edca855	Fix Responsive design	2016-11-27 20:55:59 +01:00
Laurent Destailleur	663f7938f8	Fxi responsive design	2016-11-27 20:02:57 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	017b18d5c6	Fix #6037 #6041	2016-11-27 16:09:16 +01:00
Laurent Destailleur	2c9edd4205	Maxi debug on list. Fix responsive design.	2016-11-27 13:49:46 +01:00
Laurent Destailleur	e4a8342aef	Fix div-table-form balance on all lists (solve responsive design)	2016-11-27 11:41:10 +01:00
Laurent Destailleur	16ce156631	Fix responsive design	2016-11-25 18:32:52 +01:00
gauthier	c433829d27	NEW : interface	2016-11-25 11:04:42 +01:00
Laurent Destailleur	63d0622790	Fix phpcs	2016-11-24 19:48:28 +01:00
gauthier	480b08bd0b	NEW : convert exceiss received to reduc	2016-11-24 15:48:04 +01:00
Laurent Destailleur	60b1591f0e	Fix the notes must not be into the tooltip of ref.	2016-11-23 20:30:43 +01:00
Laurent Destailleur	2b944728fd	Fix code comment	2016-11-23 19:29:41 +01:00
Laurent Destailleur	cad4acffd2	FIX #6029	2016-11-22 20:40:45 +01:00
Laurent Destailleur	97034a7dff	FIX #6009	2016-11-22 20:17:20 +01:00
Laurent Destailleur	dd27a52a85	Fix several problems on new REST API on project/tasks	2016-11-19 16:08:27 +01:00
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
Laurent Destailleur	7f5fd3bbc0	Fix selection of fields	2016-11-16 21:24:51 +01:00
Laurent Destailleur	3dc9bc89d8	Finished the selection of fields on bank account list	2016-11-16 19:56:03 +01:00
Laurent Destailleur	2961039b98	Code comment	2016-11-15 13:14:26 +01:00
Laurent Destailleur	af2f4cf78d	Merge branch 'patch-20' of https://github.com/defrance/dolibarr into ... defrance-patch-20 Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/install/mysql/tables/llx_facturedet.sql	2016-11-12 13:36:45 +01:00
Laurent Destailleur	35d80aa209	Miscellaneous fixes	2016-11-12 12:40:06 +01:00
Laurent Destailleur	2645b8cd1d	Fix syntax error	2016-11-12 11:12:22 +01:00
aspangaro	8909b4111d	Add options on getNomUrl	2016-11-12 10:41:57 +01:00
aspangaro	1dcf02af3a	Correct some mistakes	2016-11-12 08:05:25 +01:00
aspangaro	e13e66ce7b	Update works	2016-11-12 07:40:08 +01:00
aspangaro	137561aec9	Merge remote-tracking branch 'Upstream/develop' into 5.0-p35	2016-11-12 06:31:06 +01:00
Laurent Destailleur	97d84ab4ab	Better responsive design	2016-11-11 23:47:56 +01:00
Laurent Destailleur	cd9f1db229	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php	2016-11-11 15:12:30 +01:00
Laurent Destailleur	614787c123	Merge pull request #5940 from aspangaro/5.0-p33 ... Correct typo	2016-11-11 14:26:33 +01:00
aspangaro	44a6bc8960	Cancel typo profit	2016-11-11 14:19:21 +01:00
Laurent Destailleur	2cfcca82b4	Fix list of linked object block	2016-11-11 02:18:48 +01:00
Laurent Destailleur	ab269bd7a6	Better responsive	2016-11-11 01:15:41 +01:00
florian HENRY	9daac25519	Fix translation for CRON	2016-11-10 08:31:08 +01:00
Laurent Destailleur	d1446bb7ef	NEW Show subtotal into list of linked elements	2016-11-08 19:19:30 +01:00
Laurent Destailleur	fcca3d6be1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-11-08 17:21:41 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Laurent Destailleur	bf7916e310	Merge pull request #5959 from defrance/patch-39 ... bad tx_tva if PRODUIT_CUSTOMER_PRICES enabled...	2016-11-08 14:34:06 +01:00
Laurent Destailleur	c372d0ab8e	Fix clearing filters	2016-11-06 22:42:34 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
BENKE Charlie	f7294d5c3f	Update fiche-rec.php	2016-11-05 11:04:16 +01:00
BENKE Charlie	85c57e76e0	Update facture.php	2016-11-05 11:01:38 +01:00
aspangaro	5ed79800e0	Begin to wok on Vat expense report integration in reports	2016-11-05 07:48:42 +01:00
Laurent Destailleur	0fea6f22a9	Change code to reduce need of jmobile	2016-11-05 03:27:56 +01:00
Laurent Destailleur	ebe3ed9ad4	Uniformize code	2016-11-04 17:48:20 +01:00
Laurent Destailleur	0f016bbbcb	Uniformise look and feel	2016-11-03 20:57:19 +01:00
Laurent Destailleur	6ceb79cf5a	Uniformise look and feel	2016-11-03 20:55:55 +01:00
Laurent Destailleur	59291be6e0	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00