dolibarr

Author	SHA1	Message	Date
Philippe GRAND	e9bd1be41b	Standardize and update code	2018-10-09 15:38:42 +02:00
Laurent Destailleur	dfe9c05d2f	Merge menu entry for tags/categories as submenu of element.	2018-10-09 15:26:15 +02:00
Laurent Destailleur	41add1c251	Standardize code	2018-10-04 19:19:29 +02:00
Laurent Destailleur	6fcb45cf40	Rename page various_payment/index.php into list.php (coding rule)	2018-10-04 19:10:39 +02:00
Laurent Destailleur	5034264d60	Debug / Standardize code	2018-10-04 18:27:49 +02:00
Laurent Destailleur	ebba33635b	Close #9674 by keeping old code present (this help for transition tests)	2018-10-04 18:20:57 +02:00
Laurent Destailleur	ae62204a79	Merge pull request #9628 from grandoc/new_branch_28_09_2018 Standardize and update code	2018-10-01 01:04:36 +02:00
Laurent Destailleur	2f88f84e3b	Clean code	2018-09-28 22:13:42 +02:00
Philippe GRAND	15ff9f8917	Standardize and update code	2018-09-28 14:44:47 +02:00
Laurent Destailleur	f88170e22a	Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks NEW Add somes hooks in bank planned entries	2018-09-23 15:49:50 +02:00
TuxGasy	db223af39b	Add somes hooks in bank planned entries	2018-09-22 18:44:00 +02:00
Philippe GRAND	803505b6b7	Standardize and update code	2018-09-20 12:27:06 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	ce76a2e714	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 20:21:35 +02:00
Laurent Destailleur	82580cadf6	Merge pull request #9458 from frederic34/patch-17 Update account.class.php	2018-09-12 19:07:19 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	6291f18179	Merge pull request #9440 from frederic34/patch-5 Upper Lower Casing	2018-09-12 18:24:02 +02:00
Frédéric FRANCE	cdc5a174aa	Update account.class.php	2018-09-11 00:29:01 +02:00
Frédéric FRANCE	7e0b1055db	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-09 13:36:53 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	b2a58067d9	replace select_date	2018-09-09 09:56:33 +02:00
Frédéric FRANCE	ee8d56e047	Update card.php	2018-09-08 23:18:38 +02:00
Frédéric FRANCE	ef2ee8a6e4	Update card.php	2018-09-08 23:17:29 +02:00
Laurent Destailleur	84bbe8684b	Fix scrutinizer	2018-09-08 18:38:24 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Philippe GRAND	38ca6096b2	Standardize and update code	2018-09-05 10:31:12 +02:00
Frédéric FRANCE	7799774ca1	move phpcs:ignore	2018-09-04 22:52:55 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Philippe GRAND	c4f05aff28	Standardize and update code	2018-09-02 10:42:31 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	7354e485b0	precise label comment	2018-09-01 13:22:08 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Philippe GRAND	edaa575435	Standardize and update code	2018-08-31 18:36:15 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Philippe GRAND	88ad651743	Fix white spaces	2018-08-29 12:26:47 +02:00
Philippe Grand	1337d85a29	Update bankcateg.class.php	2018-08-28 10:40:41 +02:00
Philippe GRAND	65af8f902f	Update and standardize code	2018-08-28 09:44:54 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	e0462b975b	Update and standardize code	2018-08-22 11:48:26 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	116f4a1a09	Fix responsive	2018-08-19 02:22:12 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	d25fa61998	return comment	2018-08-14 13:14:55 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
Philippe GRAND	fb565b15c5	standardize	2018-07-29 19:16:28 +02:00
Frédéric FRANCE	c991a4d204	trim trailing	2018-07-26 18:05:20 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Philippe GRAND	7d5464cfbc	Clean and update code	2018-07-25 15:25:23 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Laurent Destailleur	2c7029850a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/website.lib.php htdocs/website/index.php	2018-07-21 20:28:26 +02:00
Laurent Destailleur	5523312f87	Fix missing email	2018-07-18 15:36:07 +02:00
Laurent Destailleur	38de5a8f2a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-18 14:25:19 +02:00
Laurent Destailleur	bef777e19d	Fix default order for bank entry list	2018-07-18 14:24:58 +02:00
Laurent Destailleur	47cb1f920e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-17 21:43:08 +02:00
Laurent Destailleur	7662f8f25c	Fix balance	2018-07-17 21:39:41 +02:00
Laurent Destailleur	c68b9493e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-17 21:21:20 +02:00
Laurent Destailleur	a7853211d6	Fix balance when sorting of value date desc	2018-07-17 21:20:38 +02:00
Laurent Destailleur	34c2facff1	Fix missing link on bank account	2018-07-17 18:16:30 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Laurent Destailleur	9717a32a2e	Merge pull request #8960 from grandoc/new_branch_13_06_2018 clean code	2018-06-14 12:01:19 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Philippe GRAND	a937d9e657	clean code	2018-06-13 22:52:24 +02:00
Papoteur	6567365086	In list of bank accounts, display the balance in formatted price [Problem to solve] in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine. [Solution] Change a parameter in the price function to format the balance with the required number of decimals.	2018-06-13 08:39:26 +02:00
Frédéric FRANCE	84f2b31d46	loadlangs	2018-05-27 09:40:17 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	3340598cf8	FIX Projet is not prefilled when created from overwiew page	2018-05-01 14:15:11 +02:00
Laurent Destailleur	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	e72c2e6a11	Enhance sorting of field for lists on field with several sort criterias	2018-04-28 19:54:41 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	69c26e19a8	NEW Can edit the text color for title line of tables	2018-04-15 22:01:52 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	590bc2948a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/bank/card.php htdocs/core/tpl/admin_extrafields_view.tpl.php	2018-04-11 17:20:49 +02:00
Laurent Destailleur	628b437e28	Update card.php	2018-04-11 16:25:05 +02:00
Laurent Destailleur	9af052602a	Fix css	2018-04-11 12:54:57 +02:00
atm-arnaud	848d76ee78	FIX #8023	2018-04-10 14:43:32 +02:00
Laurent Destailleur	54a86dc2b1	Fix CSS	2018-04-09 11:42:43 +02:00
Laurent Destailleur	0475cb8018	FIX Permission for bookkeeper	2018-04-09 10:51:58 +02:00
Laurent Destailleur	0c0f950338	Look and feel	2018-04-09 00:03:13 +02:00
Laurent Destailleur	cfa667f9df	Fix rounding in data shown	2018-04-09 00:01:15 +02:00
Laurent Destailleur	165ee9598a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/bankentries_list.php	2018-04-07 21:52:51 +02:00
Laurent Destailleur	304adff973	FIX view of balance before field Conflicts: htdocs/compta/bank/bankentries_list.php	2018-04-07 21:49:59 +02:00
Laurent Destailleur	893adae346	FIX view of balance before field	2018-04-07 21:45:06 +02:00
Laurent Destailleur	989d1c87c6	Fix link to reconcile	2018-04-07 20:06:19 +02:00
Laurent Destailleur	bacee3c298	Translation	2018-04-07 20:06:14 +02:00
Laurent Destailleur	88890cf9f4	Fix link to reconcile	2018-04-07 20:03:59 +02:00
Laurent Destailleur	b801a465f5	Translation	2018-04-07 19:42:47 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	15c7bbf9d8	Fix input lost when error	2018-04-07 12:28:10 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Laurent Destailleur	7c394733e4	Merge pull request #8445 from ATM-Consulting/develop_atm NEW: bank reconcile: checkbox to select all bank operations	2018-03-29 14:49:41 +02:00
Laurent Destailleur	1c86eb1c44	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/quarter_report.php htdocs/core/lib/tax.lib.php	2018-03-29 03:08:01 +02:00
Laurent Destailleur	34fae0bd48	Merge pull request #8456 from atm-greg/Fix_bankentries_list FIX sql error using no category	2018-03-27 17:49:01 +02:00
Laurent Destailleur	d1e9a4719b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/accountancy/supplier/index.php	2018-03-27 12:27:15 +02:00
atm-greg	91d6a1b621	fix sql error using no category	2018-03-27 06:40:12 +02:00
Laurent Destailleur	89bf781fe6	FIX Add warning when expense report line not into range FIX Name of user not visible on journalizing expense report payments FIX Only approved expense report must be journalized	2018-03-26 14:13:40 +02:00
Marc de Lima Lucio	5c46d62acd	NEW: bank reconcile: checkbox to select all bank operations	2018-03-23 11:04:11 +01:00
Laurent Destailleur	5a397fff72	Fix scrutinizer bugs	2018-03-16 00:16:32 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	5c4b5cc74f	fix	2018-03-11 00:40:35 +01:00
Laurent Destailleur	897b3f7b79	Fix setup	2018-03-11 00:31:26 +01:00
florian HENRY	8e84b733dc	fix scrutinizer	2018-03-10 00:13:41 +01:00
Regis Houssin	fd9c79fa7f	Fix: use getEntity if no rowid to compare	2018-03-08 07:42:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	fe45e82e99	Fix use of table llx_c_paiement (param showempty was not used/set)	2018-03-07 19:00:38 +01:00
Laurent Destailleur	e073fa15f7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-02 14:00:27 +01:00
Laurent Destailleur	a815326a28	Fix filters on bank entry list	2018-03-01 12:37:03 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	109c447171	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 03:21:37 +01:00
Laurent Destailleur	fa3b1c74a9	Fix bad link	2018-02-12 02:25:34 +01:00
Laurent Destailleur	1300f7172f	NEW Can fix the bank account of a payment if payment not conciliated	2018-02-12 02:17:52 +01:00
Laurent Destailleur	19a0f552c9	Fix td balance	2018-02-08 16:50:01 +01:00
Laurent Destailleur	493a9a7289	Fix td balance	2018-02-08 16:49:28 +01:00
Laurent Destailleur	a200a7f149	Fix look and feel v7	2018-02-08 16:43:10 +01:00
Laurent Destailleur	cc20a9d1d5	FIX #8079	2018-02-08 16:43:05 +01:00
Laurent Destailleur	490e093926	Fix look and feel v7	2018-02-08 16:41:50 +01:00
Laurent Destailleur	91bed7c014	FIX #8079	2018-02-08 16:13:12 +01:00
Laurent Destailleur	6de2a08d70	Fix scrutinizer bugs	2018-02-03 19:10:52 +01:00
Laurent Destailleur	491e64db06	Fix various payments	2018-01-29 19:07:42 +01:00
Laurent Destailleur	4eb7d7a332	Debug blockedlog with various payments	2018-01-29 18:22:26 +01:00
Laurent Destailleur	7a1a2cf90d	Fix send into ledger for bank line record. Show accounted status.	2018-01-22 04:13:29 +01:00
Laurent Destailleur	64ae70d106	Fix scrutinizer bug	2018-01-12 15:20:17 +01:00
Laurent Destailleur	3423d4e6d3	Fix balance is amount after, so i fix by adding amount before	2018-01-12 13:35:53 +01:00
Laurent Destailleur	9827358002	Merge pull request #8040 from atm-florian/dev_fixsecu fix #7963	2018-01-11 00:44:45 +01:00
Laurent Destailleur	bc9fc2828a	Fix missing class	2018-01-10 10:42:36 +01:00
florian HENRY	fdedd6f75b	fix 7963	2018-01-08 20:54:40 +01:00
Laurent Destailleur	70cfec37b1	Fix add of free entry into bank account	2018-01-05 17:38:21 +01:00
Laurent Destailleur	5580cedfdc	Fix add of free entry into bank account	2018-01-05 17:35:28 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
Laurent Destailleur	9ea2fe226d	Fix look and feel v6	2017-12-20 19:30:30 +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
Laurent Destailleur	9cdf322bfb	Fix scrutinizer bugs	2017-12-15 22:14:28 +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
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	9314dcb046	Fix regression	2017-12-12 10:13:48 +01:00
Alexandre SPANGARO	7b935a96bf	FIX : Various payment	2017-12-11 07:03:37 +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
Laurent Destailleur	02d9e93ed4	Fix badge and use of data-html instead of html tag	2017-12-10 15:46:35 +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	1b3680c200	Fix missing css	2017-12-03 12:21:38 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +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
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +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	3db52b5f9e	Debug responsive of v7	2017-11-24 14:23:25 +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	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
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	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
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	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +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
Laurent Destailleur	7b661685cc	Debug modBlockedLog module	2017-10-24 15:22:46 +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	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
Frédéric FRANCE	735f06fd83	FIX #7675	2017-10-21 16:20:06 +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	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	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	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	7c9993ef0e	Various fixes	2017-10-13 12:14:57 +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
arnaud	fd796723f2	FIX bankentries search conciliated if val 0	2017-10-10 17:15:01 +02:00
Laurent Destailleur	4c23363400	Fix creation of tax payment	2017-10-07 21:27:18 +02:00
Laurent Destailleur	e40bffb0d5	Fix bug reported by scrutinizer	2017-10-07 20:21:47 +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
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	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	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +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
Laurent Destailleur	3f3a5e0921	Merge pull request #7499 from atm-gauthier/NEW_custom_meteo New custom meteo	2017-10-02 00:48:52 +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
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	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	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Laurent Destailleur	ffe2ee8232	Standardize code	2017-09-19 19:00:28 +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
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	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	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	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	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	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	84fcbb724e	Add project on various_payment	2017-09-01 07:21:27 +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
Alexandre SPANGARO	4998eb3061	Fix: Accountancy journal, fetch on rowid, not code	2017-08-29 21:21:59 +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	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
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
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	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	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
Alexandre SPANGARO	e41543c22e	Fix v6: Debug various_payment	2017-08-01 06:44:37 +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
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
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	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	bdfb0b7561	FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes	2017-07-26 21:22:53 +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
florian HENRY	d6d454edc8	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:32:27 +02:00
florian HENRY	b9d5f4ba10	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-24 09:02:32 +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
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	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	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
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 Destailleur	1d35c87c18	Merge pull request #7125 from aspangaro/6.0-fec3 Fix some problems	2017-07-07 20:32:27 +02:00
Laurent Destailleur	749e5eb7f4	Fix link	2017-07-07 20:24:39 +02:00
Alexandre SPANGARO	0c5febfb4d	Fix: Accountancy	2017-07-07 06:09:49 +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	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +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
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	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	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	f39fb5187a	Fix component to select journal	2017-06-15 20:27:40 +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
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	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +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
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	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +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	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +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	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	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
Laurent Destailleur	eb4cfc11cb	Fix syntax error	2017-05-11 11:58:16 +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
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
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 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	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
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	cc8e66d079	FIX Journal code of bank must be visible of accountaing module on.	2017-04-29 15:30:40 +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	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
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +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	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
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	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
Laurent Destailleur	3740137e31	Add tooltip on label of each open item.	2017-03-28 10:44:52 +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	22247271f6	CSS enhancement	2017-03-23 13:19:00 +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
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
Laurent Destailleur	29953b46cd	Fix css	2017-03-03 15:32:34 +01:00
Laurent Destailleur	be86664e43	FIX #6449	2017-03-03 14:27:01 +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	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
gauthier	c01988ba43	FIX : delete bank class lines when we delete bank_categ	2017-02-09 17:28:37 +01:00
Juanjo Menent	3e14a89eb0	Fix #6314	2017-01-27 23:05:29 +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	a05132d26e	Fix PHP 7.1 error	2017-01-16 09:05:09 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +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	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Laurent Destailleur	fc401a9c68	Fix more security fixes	2016-12-18 17:27:06 +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	372f50bbde	FIX Do not show total of balance if currencies differs	2016-12-11 11:51:21 +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
aspangaro	896fbfe2ca	Bank : Detail of a banking writing more responsive (Remove rowspan)	2016-12-10 20:59:25 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
Laurent Destailleur	663f7938f8	Fxi responsive design	2016-11-27 20:02:57 +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
Laurent Destailleur	cad4acffd2	FIX #6029	2016-11-22 20:40:45 +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	97d84ab4ab	Better responsive design	2016-11-11 23:47:56 +01:00
Laurent Destailleur	c372d0ab8e	Fix clearing filters	2016-11-06 22:42:34 +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	59291be6e0	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00
Laurent Destailleur	91ee1fae51	Fix feature to jump on a numbered page.	2016-10-29 17:46:11 +02:00
Laurent Destailleur	854e75513b	Fix bad alias	2016-10-25 21:44:10 +02:00
Laurent Destailleur	43bf372cf7	Fix doxygen	2016-10-25 21:15:25 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
Laurent Destailleur	939afa9569	NEW Can make reconcile directly from bank entry list	2016-10-23 23:24:55 +02:00
Laurent Destailleur	534202ad45	NEW Can make reconcile directly from bank entry list	2016-10-23 23:13:03 +02:00
Laurent Destailleur	8fa44e9363	Fix balance calculation	2016-10-22 17:56:12 +02:00
Laurent Destailleur	35601775e0	By default we open a new tab on external url link	2016-10-22 17:05:47 +02:00
Laurent Destailleur	14e78ef50b	Mutualize code of 2 lists into one page.	2016-10-22 13:52:43 +02:00
Laurent Destailleur	3219c07adc	FIX Avoid error if no data	2016-10-21 18:45:44 +02:00
Laurent Destailleur	f93bca9be9	NEW Can see/make bank conciliation from transaction list	2016-10-21 17:00:31 +02:00
Laurent Destailleur	4cf4090cde	Css	2016-10-17 00:21:39 +02:00
Laurent Destailleur	28933c31dd	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/projet/card.php	2016-10-16 19:04:33 +02:00
aspangaro	380ab8bfa5	Fix: Show Ref/rowid of loan	2016-10-15 07:05:53 +02:00
aspangaro	849e46ab1d	Merge remote-tracking branch 'Upstream/develop' into 5.0-p21	2016-10-15 05:59:11 +02:00
aspangaro	38c75ffeb0	Fix: Missing td in list of bank account.	2016-10-15 05:57:10 +02:00
Laurent Destailleur	d27dea8320	NEW Can rename uploaded or generated files on all "documents" tabs.	2016-10-14 18:09:24 +02:00
Laurent Destailleur	93c848fcc5	Add page index for accountancy module	2016-10-06 17:43:10 +02:00
Laurent Destailleur	c982409c72	Fix a deadlock feature	2016-10-06 15:29:10 +02:00
Laurent Destailleur	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +02:00
Laurent Destailleur	e79a84a89b	Uniformize code	2016-10-05 21:49:04 +02:00
Laurent Destailleur	31ce725d73	Maxi debug of accountancy expert module	2016-10-04 19:31:05 +02:00
Laurent Destailleur	a52ad545eb	Enhancement on module Direct Debit SEPA.	2016-10-02 13:03:45 +02:00
Laurent Destailleur	3cb13e16d1	Merge branch 'rest-api-add-accounts' of https://github.com/EuskalMoneta/dolibarr into EuskalMoneta-rest-api-add-accounts Conflicts: htdocs/api/index.php htdocs/commande/class/api_orders.class.php	2016-09-26 02:28:16 +02:00
Xebax	fe2498ffc1	Fix coding style errors.	2016-09-25 19:11:16 +02:00
Xebax	58179f71fc	Add Accounts to REST API.	2016-09-25 17:48:48 +02:00
Laurent Destailleur	95f2cae825	Start to work on sepa mandate generation	2016-09-19 00:26:30 +02:00
Laurent Destailleur	c8b8e13014	Work on dol_banner for proposals.	2016-09-18 21:38:20 +02:00
Laurent Destailleur	537c6b0cc7	Uniformize code	2016-09-18 15:57:53 +02:00
Laurent Destailleur	13c3db08e7	Uniformize code and look and feel	2016-09-18 15:48:29 +02:00
Laurent Destailleur	5146a0ce56	Fix filter on num account statement	2016-09-14 21:29:08 +02:00
Laurent Destailleur	145c1e1cc8	NEW Add account statement into fields of bank account transaction list	2016-09-14 21:26:57 +02:00
Laurent Destailleur	630aab9124	NEW Can select fields to show on list of bank transaction	2016-09-14 21:06:16 +02:00
Laurent Destailleur	2facdda690	Uniformize code	2016-09-12 21:54:45 +02:00
Juanjo Menent	1f67b025d7	Merge pull request #5672 from aspangaro/5.0-p4 Fix: Missing language key	2016-08-31 02:09:55 +02:00
Juanjo Menent	8155c09d49	Merge pull request #5671 from aspangaro/5.0-p3 Fix: Presentation on financial account	2016-08-31 02:08:33 +02:00
Laurent Destailleur	524dd79198	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/bank/search.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/projet/tasks/time.php	2016-08-31 00:16:07 +02:00
Laurent Destailleur	124df446d7	Fix remove log	2016-08-30 18:12:26 +02:00
Laurent Destailleur	cb660cba86	NEW More filter on bank transaction list	2016-08-30 18:10:30 +02:00
Laurent Destailleur	b06cc18568	Fix sort on amount	2016-08-30 11:53:42 +02:00
aspangaro	cfcd9677f1	Fix: Missing language key	2016-08-29 21:54:52 +02:00
aspangaro	358bcee3a5	Presentation on financiel account	2016-08-29 21:49:34 +02:00
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
Laurent Destailleur	03c30c487c	Uniformise code	2016-08-22 13:46:38 +02:00
aspangaro	b7420372b7	Uniformize presentation, add button cancel everywhere	2016-08-12 22:53:30 +02:00
aspangaro	43ffb061ef	FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option	2016-08-10 08:07:27 +02:00
Laurent Destailleur	b267402df6	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php	2016-08-01 15:15:32 +02:00
Laurent Destailleur	e5583f1544	Fix bad translation. Confusionbetween internal tranfert and bank tranfert for payements	2016-07-30 17:28:18 +02:00
Laurent Destailleur	f54946bacb	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql	2016-07-28 10:10:58 +02:00
Laurent Destailleur	fb8f0ed657	FIX #5503	2016-07-27 20:05:22 +02:00
florian HENRY	419dd3095b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_fix5353 Conflicts: htdocs/societe/class/societe.class.php	2016-07-26 08:59:40 +02:00
Laurent Destailleur	af09528738	NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and __AMOUNT_WO_TAX__ into emails templates.	2016-07-21 20:45:30 +02:00
Laurent Destailleur	621a29d0e0	Fix account may contains text	2016-07-18 12:01:25 +02:00
aspangaro	e6da7c5574	Fix: Accountancy - Problem with empty accountancy acccount in create / modify mode	2016-07-17 07:09:17 +02:00
frederic34	cf8fb5c230	Merge remote branch 'upstream/develop' into charges	2016-07-15 09:57:27 +02:00
appchecker	f618f330b3	replace intval with GETPOST	2016-07-11 13:01:16 +03:00
appchecker	2c297bbcc8	prevent SQLi	2016-07-07 20:25:15 +03:00
florian HENRY	32e954c8d8	Merge branch 'develop' of local repository into dev_fix5353	2016-07-01 15:08:15 +02:00
Laurent Destailleur	05384b2f88	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/list.php htdocs/projet/card.php htdocs/societe/consumption.php	2016-07-01 02:39:29 +02:00
Laurent Destailleur	29e26c2342	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/lib/sendings.lib.php	2016-07-01 02:06:30 +02:00
florian HENRY	12aee3e76c	ibazn managment	2016-06-30 16:07:53 +02:00
arnaud	0ffe106e2c	FIX #4749	2016-06-30 16:03:48 +02:00
florian HENRY	1e4916bd53	better way to manamge IBAN/BIC Mandatory	2016-06-30 16:01:53 +02:00
florian HENRY	d431e73ec8	Fix #5353	2016-06-30 15:49:57 +02:00
Laurent Destailleur	5222b78e95	FIX property of bank account were lost if an error occured during saving.	2016-06-25 14:20:23 +02:00
Laurent Destailleur	b01eed697e	Fix sort on thirdparty on bank transaction list	2016-06-20 11:30:43 +02:00
frederic34	e71833c0d9	typo	2016-06-19 20:24:20 +02:00
frederic34	77071ca515	select bank and payment mode for social contrib	2016-06-19 18:53:19 +02:00
Laurent Destailleur	4382f2a437	Clean language files	2016-06-18 11:06:11 +02:00
Laurent Destailleur	9019576394	Fix css class opacitymedium was not used everywhere.	2016-06-07 15:58:02 +02:00
Laurent Destailleur	fb13225173	Fix links on list from warnings dashboard	2016-06-06 16:31:50 +02:00
Laurent Destailleur	7935967c62	Fix duplicate translation key	2016-05-21 12:30:58 +02:00
Laurent Destailleur	4c2098b667	Fix duplicate table title	2016-05-18 20:58:29 +02:00
BENKE Charlie	0944463805	Add : rappro order list	2016-05-14 10:06:35 +02:00
Laurent Destailleur	6bb269381a	Merge pull request #5143 from frederic34/morecateg categories account like other categories	2016-05-07 20:25:17 +02:00
Laurent Destailleur	a8363052c6	Better style	2016-04-30 15:55:39 +02:00
frederic34	17463b4927	categories account like other categories	2016-04-30 14:45:24 +02:00
Laurent Destailleur	6ffb45f5d8	FIX Missing param user on update()	2016-04-30 13:58:35 +02:00
Laurent Destailleur	0cde6ad98f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/filefunc.inc.php	2016-04-29 20:43:42 +02:00
Juanjo Menent	a33df1401b	Merge pull request #5079 from marcosgdf/fix-undefined-variable Fixed undefined $user variable in Account::countAccountToReconcile	2016-04-29 11:58:48 +02:00
fmarcet	33499ae652	FIX: Compatible with multicompany	2016-04-28 11:14:00 +02:00
Marcos García de La Fuente	f195107bd1	Fixed undefined $user variable in Account::countAccountToReconcile	2016-04-23 13:25:23 +02:00
aspangaro	2a7c7a0748	Same problem on bank	2016-04-23 08:09:38 +02:00
Maxime Kohlhaas	5904f33039	Fix bank statement display	2016-04-22 11:44:23 +02:00
Laurent Destailleur	d40e659b30	Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown	2016-04-19 19:11:54 +02:00
Frédéric FRANCE	18b3b3a31d	Update rappro.php	2016-04-18 08:14:02 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
Laurent Destailleur	e61c83d708	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:03:19 +02:00
Marcos García de La Fuente	a41a80b8fe	Merge branch 'develop' into oop-refactor-bankaccount-tostring	2016-04-09 23:17:09 +02:00
Marcos García de La Fuente	3135cf720d	FIX #4737 Bank transacion type selector translation is cropped Close #4737	2016-04-09 22:59:12 +02:00
Laurent Destailleur	5b55af4d66	NEW Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.	2016-04-09 14:12:21 +02:00
Laurent Destailleur	104e34fe22	Fix css and missing link "go to list"	2016-04-08 03:40:23 +02:00
Laurent Destailleur	27ed9ba3da	Remove now link useless here	2016-04-01 12:13:43 +02:00
Laurent Destailleur	f61f1c7a27	Merge pull request #4857 from marcosgdf/bankacc-misc Little refactor	2016-03-25 17:43:56 +01:00
Marcos García de La Fuente	889c72611d	NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown	2016-03-19 23:00:33 +01:00
Marcos García de La Fuente	59bfac65aa	Little refactor	2016-03-19 20:48:37 +01:00
Marcos García de La Fuente	1be9c53b6c	NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country	2016-03-19 19:39:18 +01:00
Laurent Destailleur	5eef373ed6	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/search.php htdocs/user/card.php	2016-03-18 14:56:44 +01:00
Laurent Destailleur	c5e744bfc2	FIX #4839	2016-03-18 12:16:40 +01:00
Laurent Destailleur	dca5e5278b	Merge pull request #4736 from marcosgdf/bankcateg-oop NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function	2016-03-12 12:01:32 +01:00
Laurent Destailleur	7c950be468	Fix Phpcs	2016-03-11 18:04:45 +01:00
Marcos García de La Fuente	39f915d95d	Reverted use of BankCateg in Bank category listing	2016-03-10 19:52:27 +01:00
Laurent Destailleur	ecf47109c0	Merge pull request #4739 from marcosgdf/accountline-oop NEW Created AccountLine::insert function and started using it for transaction creation	2016-03-10 13:55:07 +01:00
Laurent Destailleur	79989c2f65	Merge pull request #4741 from marcosgdf/account-oop-properties Fixed wrong Account class property used in bank/card.php	2016-03-10 13:53:17 +01:00
Laurent Destailleur	21bf8824b9	Merge pull request #4738 from marcosgdf/account-libstatut Refactored Account::libStatut and added object typehinting to some functions of Account class	2016-03-10 13:29:02 +01:00
Laurent Destailleur	4fa84c8d8f	Merge pull request #4707 from marcosgdf/misc2 Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated	2016-03-10 13:21:51 +01:00
Laurent Destailleur	09a29322c3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php htdocs/commande/orderstoinvoice.php htdocs/public/demo/index.php htdocs/societe/commerciaux.php	2016-03-08 17:40:21 +01:00
Marcos García de La Fuente	08d27b7148	Refactored Account::LibStatut function	2016-03-07 11:31:16 +01:00
Marcos García de La Fuente	66f71d16d9	Fixed wrong Account class property used in bank/card.php	2016-03-06 19:59:37 +01:00
Laurent Destailleur	3dbe27030e	FIX If all banks account are reconcilable to off, we must not show nb of transactions to reconciles. FIX Switching status reconcile on-off was broken.	2016-03-06 12:39:59 +01:00
Marcos García de La Fuente	ed51a42963	NEW Created AccountLine::insert function and started using it for transaction creation	2016-03-05 16:26:30 +01:00
Marcos García de La Fuente	4f569279d6	Refactored Account::libStatut and added object typehinting to some functions of Account class	2016-03-05 16:14:41 +01:00
Marcos García de La Fuente	0fd9518ad0	NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function Also replaced spaces with tabs and applied PSR-2 beautifier to the code	2016-03-05 15:51:02 +01:00
Marcos García de La Fuente	6184c71181	Corrected comparison of Account::canBeConciliated output	2016-03-05 14:05:00 +01:00
Laurent Destailleur	cbd102fa45	Merge and rename method into camel format	2016-03-04 16:28:38 +01:00
Marcos García de La Fuente	ff83dd9afe	Replaced account type comparisons with TYPE constants	2016-03-02 11:08:57 +01:00
Marcos García de La Fuente	dcde7773a3	Started using Account TYPE and STATUS constants	2016-03-02 11:04:52 +01:00
Marcos García de La Fuente	66313f584b	Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated	2016-03-02 10:52:54 +01:00
Marcos García de La Fuente	e646f28c0a	Documented properties of Account class	2016-03-01 15:46:06 +01:00
Frédéric FRANCE	5841055d9a	Update releve.php	2016-02-14 22:53:00 +01:00
Frédéric FRANCE	e7a7909b9d	Update rappro.php	2016-02-14 12:16:17 +01:00
Laurent Destailleur	bc33b19d7d	NEW Can change dynamically number of records visible into lists.	2016-02-11 20:24:15 +01:00
Laurent Destailleur	9da0164d90	Uniformize code for lists	2016-02-07 15:50:48 +01:00
Laurent Destailleur	eee0037a5b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-30 14:32:47 +01:00
Laurent Destailleur	c4d8c20abb	Fix missing include	2016-01-30 14:32:20 +01:00
Laurent Destailleur	bb1cad871b	Merge pull request #4478 from frederic34/patch-7 Add fk_bordereau in account statements	2016-01-30 12:34:09 +01:00
Laurent Destailleur	11f6cb6f5a	Merge pull request #4479 from frederic34/patch-8 Add fk_bordereau in account statement conciliation	2016-01-30 12:31:36 +01:00
Maxime Kohlhaas	6313f64c93	Fix : amount in bank line is necessarily in the account currency	2016-01-26 18:09:52 +01:00
Frédéric FRANCE	4ed2831112	Add fk_bordereau in account statement conciliation	2016-01-22 12:23:13 +01:00
Frédéric FRANCE	4d842d91d7	Add fk_bordereau in account statements	2016-01-22 12:20:03 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
Frédéric FRANCE	b0530539f4	Update rappro.php	2016-01-20 13:59:56 +01:00
Frédéric FRANCE	0a7de725b0	typo	2016-01-19 19:08:01 +01:00
Raphaël Doursenaud	7281338f8d	FIX #4291 Correctly filter bank card GETPOSTs	2016-01-11 10:51:45 +01:00
Juanjo Menent	dbd427ea06	Merge pull request #4264 from aspangaro/develop-a6 Accountancy Add a list to select accounting account on bank account	2016-01-09 17:42:52 +01:00
Laurent Destailleur	6f474c403c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php	2015-12-27 19:15:20 +01:00
Laurent Destailleur	0645938283	FIX #4230 PHP7 error	2015-12-27 18:26:21 +01:00
Marcos García	da959c5cf0	Little typo in commit `8b633ae`	2015-12-25 11:32:13 +01:00
Marcos García de La Fuente	8b633aee66	FIX #4182 SQL error when deleting an unexisting bank entry	2015-12-24 14:39:28 +01:00
Laurent Destailleur	db7a98f0ef	Fix: When a payment mode was disabled, it was not visible on old records. Fix: init of $limit not correctly set according to 3.9 rules on most pages.	2015-12-21 13:56:59 +01:00
aspangaro	3b0514af6f	Accountancy Add a list to select accounting account on bank account	2015-12-19 07:47:40 +01:00
philippe grand	30eb08151d	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
Laurent Destailleur	192fdbdcc4	Minor look uniformization	2015-11-14 23:10:12 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00
Laurent Destailleur	eac80d7db4	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php	2015-11-13 11:43:29 +01:00
philippe grand	12c5d02a7a	[Qual] Uniformize code	2015-11-11 12:27:09 +01:00
Laurent Destailleur	1d2dab63a3	More space	2015-11-08 02:32:22 +01:00
Laurent Destailleur	333dd10874	Add a way to lin on bank receipt tab directly	2015-11-08 02:09:32 +01:00
Laurent Destailleur	7a423c04d4	Fix The only default value is value we just entered	2015-11-08 02:00:28 +01:00
Laurent Destailleur	e350b759d3	Increase number of last bank receits visible links	2015-11-08 00:52:25 +01:00
Laurent Destailleur	b5c9602da4	Fix Use new look for left-right arrow	2015-11-08 00:08:50 +01:00
Laurent Destailleur	031b33d582	FIX Checkbox reconciliated no correctly checked with some Chrome versions	2015-11-07 23:54:11 +01:00
Marcos García de La Fuente	728f469c1e	FIX #3890 Expected transactions bank account page, shows negative numbers	2015-11-07 13:43:59 +01:00
Laurent Destailleur	461771d488	Currency is on title only.	2015-10-24 21:20:32 +02:00
Juanjo Menent	334c14d088	Fix: Last page total is 0	2015-10-18 11:56:42 +02:00
philippe grand	f31ddc23aa	[Qual] Uniformize code	2015-10-17 16:18:33 +02:00
Laurent Destailleur	8c66a7d099	Revert a bad PR. if form_confirm is replaced with formconfirm, we must include a print before. It is no more included into function.	2015-10-17 02:01:13 +02:00
Frédéric FRANCE	7065b2aa7d	Update account.php	2015-10-10 12:59:58 +02:00
philippe grand	0e343ae3b2	syntax error	2015-10-08 09:34:02 +02:00
Laurent Destailleur	f54a1ca367	CSS enhancement	2015-10-06 01:03:31 +02:00
Frédéric FRANCE	c077e69047	Autocomplete with last conciliate number	2015-10-03 20:54:27 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Juanjo Menent	ad1a4c7e15	Merge pull request #3598 from GPCsolutions/formconfirm [Qual] Replaced deprecated form_confirm()	2015-09-26 08:48:16 +02:00
Raphaël Doursenaud	485c369d55	[Qual] Replaced deprecated form_confirm()	2015-09-24 21:10:35 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Raphaël Doursenaud	631ee83745	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
Raphaël Doursenaud	dabfad1529	[Qual] Replaced deprecated print_titre()	2015-09-24 18:27:13 +02:00
Laurent Destailleur	615734012e	Merge pull request #3476 from marcosgdf/refactor Refactor: Created hasDelay functions	2015-09-09 20:50:58 +02:00
Marcos García de La Fuente	2f85d02911	Added missing RemiseCheque properties	2015-09-06 19:24:17 +02:00
Laurent Destailleur	c03d508bd3	Merge pull request #3467 from guerrierk/develop NEW Adding Document tab into Bank Account	2015-09-05 10:26:51 +02:00
Laurent Destailleur	087938e340	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php	2015-09-05 10:25:01 +02:00
Laurent Destailleur	6ac4b8d0d4	Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2	2015-09-05 10:22:43 +02:00
Laurent Destailleur	4c0f117e55	Merge pull request #3465 from open-minds/patch-1 Fix detailed information of BBAN for Germany	2015-09-05 10:22:12 +02:00
Laurent Destailleur	8bea703363	Fix deadlock feature. Can't reconciliate cash bank account. Sometimes users need. I introduce a hidden option to fix this quickly.	2015-09-04 23:23:39 +02:00
GUERRIER Kevin	2395c1ca11	fix comment in file description	2015-09-04 21:58:09 +02:00
GUERRIER Kevin	a80b4703a9	Bugfix w/ Travis CI	2015-09-04 21:42:14 +02:00
GUERRIER Kevin	692fdbaec4	Adding Document tab into Bank Account	2015-09-04 21:29:16 +02:00
Laurent Destailleur	a66bcf1965	Fix deadlock feature. Can't reconciliate cash bank account. Sometimes users need. I introduce a hidden option to fix this quickly.	2015-09-04 19:42:07 +02:00
Laurent Léonard	11241c51f5	Fix detailed information of BBAN for Belgium	2015-09-04 18:30:54 +02:00
Laurent Léonard	04b3c23692	Fix detailed information of BBAN for Germany	2015-09-04 18:16:43 +02:00
Laurent Destailleur	942723ff8d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-08-31 12:13:35 +02:00
Laurent Destailleur	47ea834516	Fix debug module expense report	2015-08-28 20:11:16 +02:00
Raphaël Doursenaud	33ea968b5b	Fix #3218 Bank date selectors presentation	2015-08-26 19:45:32 +02:00
philippe grand	0432254412	the form should be outside table to avoid errors	2015-08-15 15:53:07 +02:00
philippe grand	b619aa080d	the form should be outside table to avoid errors	2015-08-15 15:47:17 +02:00
Laurent Destailleur	fc8a822f1d	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-13 04:03:23 +02:00
Laurent Destailleur	c73fe965d2	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2015-08-13 03:58:32 +02:00
Laurent Destailleur	1595765ec8	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/compta/facture/class/facture.class.php	2015-08-13 03:18:02 +02:00
Marcos García de La Fuente	7cb564586e	Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything Close #3310	2015-08-09 13:52:02 +02:00
Juanjo Menent	05b0a9b675	Merge remote-tracking branch 'origin/3.7' into 3.8 # Conflicts: # htdocs/core/menus/standard/eldy.lib.php	2015-08-01 14:50:07 +02:00
Juanjo Menent	2a67bd1f38	Fix #3314 Display state in bank account card	2015-08-01 14:43:04 +02:00
Raphaël Doursenaud	3b9c8a685b	Fix #3314 Display state in bank account card	2015-07-29 19:29:18 +02:00
Laurent Destailleur	cb98d6cb93	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-19 15:32:20 +02:00
Laurent Destailleur	2f2b0df6f8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contact/exportimport.php htdocs/contact/info.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modSociete.class.php htdocs/core/tpl/document_actions_pre_headers.tpl.php htdocs/langs/fr_FR/categories.lang htdocs/main.inc.php htdocs/product/reassort.php htdocs/projet/list.php htdocs/societe/info.php	2015-07-19 12:26:31 +02:00
Laurent Destailleur	2bb1945a2f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/prelevement/class/rejetprelevement.class.php htdocs/compta/sociales/class/paymentsocialcontribution.class.php htdocs/contact/exportimport.php htdocs/contact/ldap.php htdocs/contact/perso.php htdocs/contact/vcard.php htdocs/core/class/commonobject.class.php htdocs/product/reassort.php htdocs/projet/liste.php htdocs/societe/consumption.php htdocs/societe/info.php	2015-07-19 12:04:30 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
aspangaro	05dcb0d1ac	Correct icon bank	2015-07-15 19:14:30 +02:00
aspangaro	4627e72f59	Debug && PSR2	2015-07-04 00:01:40 +02:00
Maxime Kohlhaas	5d14d05ce1	Fix : Social contribution payment deletion was not deleting the bank line	2015-07-03 16:38:54 +02:00
aspangaro	111e44493a	Disable button add a line in bank module when accountancy module is activated	2015-07-03 06:48:49 +02:00
aspangaro	d92eab49de	Add the payment in bank module	2015-06-16 05:47:24 +02:00
Laurent Destailleur	87e07a3038	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php	2015-06-14 17:18:45 +02:00
Laurent Destailleur	a7cec18081	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/categories/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/upgrade2.php htdocs/product/liste.php	2015-06-14 17:11:36 +02:00
Laurent Destailleur	f4da53c300	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/product/liste.php htdocs/product/price.php	2015-06-14 17:04:24 +02:00
Regis Houssin	b96ed08260	Fix: select date problem with mobile device (#3039 )	2015-06-14 12:46:27 +02:00
Raphaël Doursenaud	3f9270ea78	Qual: added deprecation hinting Added deprecation hinting for class properties Added syslog warning events for deprecated functions, methods and/or their parameters Added hinting for some constants	2015-06-01 11:00:11 +02:00
Florian HENRY	0331ddc2de	fix spacing	2015-05-20 11:30:27 +02:00
Florian HENRY	df4ee9562f	fix spell	2015-05-20 11:29:35 +02:00
Florian HENRY	6e6b66e416	apply recommandation from `ca53d3b602 (commitcomment-11245627)`	2015-05-20 11:24:23 +02:00
Florian HENRY	ee1aa3268c	working account	2015-05-19 11:55:45 +02:00
Florian HENRY	a6c5a247cd	add total and title in page records banck account	2015-05-18 11:08:27 +02:00
Florian HENRY	ca53d3b602	NEW : add date value filter on account records list	2015-05-18 10:43:54 +02:00
Laurent Destailleur	1b03e348d3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/annuel.php	2015-05-16 02:53:36 +02:00
Laurent Destailleur	e382999b9e	Css fix	2015-05-15 20:10:17 +02:00
Laurent Destailleur	976211b70f	Look enhancement	2015-05-15 12:53:14 +02:00
Laurent Destailleur	3e94cc07d2	Fight against valign="top". Minor css fixes.	2015-05-14 16:47:15 +02:00
Raphaël Doursenaud	aee61aa2c4	[Qual] Fixed deprecated HTML nowrap attribute to class	2015-05-12 15:37:35 +02:00
Raphaël Doursenaud	5d2f081152	[Qual] Fixed HTML select form selected attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The select form selected attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	859d1b0df9	[Qual] Fixed HTML input form checked attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form checked attribute should not have a value.	2015-05-07 14:21:14 +02:00
Laurent Destailleur	b71e5a1025	Merge pull request #2673 from aternatik/fix_getentity Fix : missing getEntity calls	2015-05-07 00:48:19 +02:00
Laurent Destailleur	100fa1067e	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/bank/virement.php htdocs/compta/facture/impayees.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modProjet.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_GB/admin.lang htdocs/langs/es_AR/orders.lang htdocs/langs/es_AR/trips.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/orders.lang htdocs/langs/es_CO/trips.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/pl_PL/interventions.lang htdocs/langs/pt_BR/trips.lang htdocs/langs/ro_RO/productbatch.lang htdocs/langs/ro_RO/trips.lang htdocs/main.inc.php htdocs/projet/element.php	2015-04-22 17:57:57 +02:00
aspangaro	560150fd1c	Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)	2015-04-22 07:15:17 +02:00
jfefe	f5db4d5bb7	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
Laurent Destailleur	5b29c87933	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php	2015-04-19 00:23:46 +02:00
Laurent Destailleur	ab77158757	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/expedition/fiche.php	2015-04-18 23:55:17 +02:00
jfefe	23e5bc4f53	Add title image for bank section	2015-04-18 23:17:47 +02:00
philippe grand	eaf0fda6aa	fix syntax errors	2015-04-18 18:07:41 +02:00
Laurent Destailleur	ae103e34b8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php	2015-04-13 13:08:46 +02:00
Marcos García de La Fuente	728b64e334	Fix Bug #2583 : Unable to create a bank transfer with localized numbers	2015-04-12 20:24:22 +02:00
Laurent Destailleur	1272b03e5e	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/menus/standard/eldy.lib.php htdocs/fourn/facture/fiche.php htdocs/product/stock/mouvement.php htdocs/projet/element.php htdocs/societe/rib.php htdocs/theme/bureau2crea/img/statut4.png	2015-04-12 12:03:59 +02:00
Laurent Destailleur	503a4ff7a0	Enhance filtering for bank transaction and timesheet.	2015-04-09 20:40:49 +02:00
Laurent Destailleur	edd104a6bc	Merge pull request #2563 from frederic34/patch-7 Accounts "from" & "to" need to have same currency	2015-04-08 11:51:41 +02:00
Frédéric FRANCE	7f62892609	Display total with currency code	2015-04-08 09:19:41 +02:00
Frédéric FRANCE	856238c876	Accounts "from" & "to" need to have same currency	2015-04-08 09:09:11 +02:00
Frédéric FRANCE	06c749942a	Update index.php	2015-04-07 18:40:19 +02:00
Frédéric FRANCE	7a2942684c	Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 12:45:25 +02:00
Laurent Destailleur	6fa0234409	Uniformize code	2015-04-07 03:00:11 +02:00
Laurent Destailleur	c9f690904c	Merge pull request #2514 from frederic34/patch-10 Correction for workboard in compta/bank/index.php	2015-04-02 11:40:55 +02:00
aspangaro	309b059089	New: Add a button to purge criteria in bank lines list	2015-03-31 21:00:22 +02:00
Frédéric FRANCE	fc5d7e57a2	Correction for workboard in compta/bank/index.php	2015-03-31 18:31:36 +02:00
Laurent Destailleur	b83e9ea32f	Merge branch 'loan' of https://github.com/frederic34/dolibarr into frederic34-loan Conflicts: htdocs/compta/bank/ligne.php	2015-03-30 02:56:26 +02:00
aspangaro	c22a563422	New: Add management for accounting account in admin donation & correct bugs	2015-03-29 21:04:20 +02:00
frederic34	b6b1617741	Work on payment loan	2015-03-29 17:53:36 +02:00
aspangaro	ce6df7c022	Debug	2015-03-29 09:20:32 +02:00
aspangaro	77b123cb2d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-27 06:30:35 +01:00
aspangaro	a39f81b1a6	FIXED: Correct path of loan class	2015-03-26 20:51:27 +01:00
aspangaro	b60f1e33d6	Debug	2015-03-26 06:29:16 +01:00
aspangaro	2b2b43afb6	Dir "Don"	2015-03-25 22:37:14 +01:00
aspangaro	9d34b40897	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc Conflicts: htdocs/compta/bank/account.php	2015-03-24 05:28:57 +01:00
aspangaro	414d4c6432	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-22 18:08:12 +01:00
aspangaro	b4b3c45dbc	Update works	2015-03-21 18:00:16 +01:00
Laurent Destailleur	6e251690ab	Doxygen	2015-03-17 11:23:45 +01:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
aspangaro	3897e65425	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-11 05:28:59 +01:00
Laurent Destailleur	209f8946d0	All files must be lowercase	2015-03-10 14:17:58 +01:00
Laurent Destailleur	3894a48ffd	Fix: bad CSS	2015-03-08 02:37:25 +01:00
aspangaro	11704e0807	Merge remote-tracking branch 'Upstream/develop' into develop-loan Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-05 20:24:53 +01:00
Laurent Destailleur	8e29dcdb79	Some fix after merging bank account number form	2015-03-04 21:59:03 +01:00
Laurent Destailleur	40adbe5a72	Merge pull request #2420 from aspangaro/develop-patch17 NEW: [T1848] Merge bank card & account card	2015-03-04 21:09:28 +01:00
aspangaro	022d051726	Typo	2015-03-03 06:32:46 +01:00
aspangaro	42e43791ef	Add ajax for type on edit mode	2015-03-03 06:20:09 +01:00
aspangaro	fafebf5b2a	NEW: [T1758] Merge bank card & account card	2015-03-02 22:44:11 +01:00
aspangaro	c119ce382e	Merge remote-tracking branch 'Upstream/develop' into develop-loan Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-02 21:05:38 +01:00
Laurent Destailleur	daabc113a5	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: README.md htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php	2015-02-26 13:36:07 +01:00
Laurent Destailleur	41a74c62e2	Fix trigger to insert lines where called when inserting line but also when cloning parent object, making no way to know when to use them or not. I introduced a context to allow code to know that and do not triggers twice.	2015-02-26 13:03:17 +01:00
aspangaro	63099727d0	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-21 15:10:35 +01:00
Frédéric FRANCE	b73f1eb827	Update account.class.php	2015-02-19 08:40:38 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	316e5c2f19	Merge pull request #2358 from marcosgdf/board-refactor Refactored dashboard indicator	2015-02-18 23:39:15 +01:00
frederic34	4bbbff8d69	Add BIC/SWIFT Validation	2015-02-17 22:04:16 +01:00
frederic34	f652cf4e97	Add translation for IBAN Valid or not	2015-02-17 17:02:38 +01:00
Marcos García de La Fuente	fa55c60c35	Renamed WorkBoardResponse to WorkboardResponse	2015-02-16 23:52:49 +01:00
Marcos García de La Fuente	d5fd20e911	Renamed BoardResponse to WorkBoardResponse	2015-02-15 15:10:51 +01:00
Marcos García de La Fuente	bab0163c44	Missing Copyright info	2015-02-15 15:07:24 +01:00
Marcos García de La Fuente	d1f73499e9	Refactored dashboard indicator	2015-02-15 15:01:28 +01:00
Marcos García de La Fuente	0d6d98b395	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +01:00
Marcos García de La Fuente	157a6e109e	Misc Adherents PHPDoc corrections	2015-02-10 10:45:48 +01:00
Maxime Kohlhaas	db9d727eb8	FIX : Link to user was wrong on bank transaction card	2015-02-08 12:36:55 +01:00
Laurent Destailleur	381af3e6bc	Field amount must be right aligned	2015-02-08 00:32:49 +01:00
Laurent Destailleur	ef31ca9b84	New: Add balance of each account statement.	2015-02-07 23:32:46 +01:00
frederic34	736bee565c	Tooltip everywhere	2015-01-30 16:40:33 +01:00
Laurent Destailleur	6bda61436b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: dev/codesniffer/ruleset.xml htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions2.lib.php htdocs/projet/element.php	2015-01-22 21:52:55 +01:00
aspangaro	6f3d9200bf	Correct link	2015-01-22 07:15:14 +01:00
frederic34	f4161b457b	Add dol_escape_htmltag and start to adapt boxes	2015-01-22 00:23:55 +01:00
frederic34	1b0dd671b3	Add tooltip in getNomUrl link	2015-01-20 21:40:33 +01:00
Laurent Destailleur	007f18bcf7	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into GPCsolutions-review Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/comm/action/peruser.php htdocs/core/class/html.form.class.php htdocs/core/lib/accounting.lib.php htdocs/core/lib/report.lib.php	2015-01-17 15:11:12 +01:00
Laurent Destailleur	87a59ef527	Merge branch 'develop_bank_extrafields' of https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields Conflicts: htdocs/admin/bank.php	2015-01-17 14:42:04 +01:00
frederic34	60661ae948	Add some "classfortooltip"	2015-01-09 00:07:54 +01:00
Laurent Destailleur	2a3bb96c34	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ecm.lib.php	2014-12-22 03:14:22 +01:00
Laurent Destailleur	8996953077	Fix: error reported by scrutinizer	2014-12-20 15:42:03 +01:00
Frédéric FRANCE	37e5a97f84	Typo	2014-12-09 23:07:41 +01:00
Frédéric FRANCE	650d4a3da9	Fix missing /form	2014-12-02 19:55:10 +01:00
Frédéric FRANCE	bff209a895	Fix missing /form	2014-11-28 08:25:51 +01:00
Laurent Destailleur	d9cb9c1585	Merge pull request #2102 from aspangaro/develop-center Task 1603 - Remove <center> deprecated HTML5 tags	2014-11-27 23:58:44 +01:00
aspangaro	c4c69e191b	Replace <center> tags	2014-11-25 20:13:43 +01:00
Laurent Destailleur	6d2e024d52	Doxygen	2014-11-23 17:53:44 +01:00
Frédéric FRANCE	dd1c39b44e	Update /compta/bank/search.php	2014-11-23 17:44:29 +01:00
Laurent Destailleur	652b0f84a7	Fixed: Field is used only by module accounting so must have a condition on it.	2014-11-23 17:03:22 +01:00
Laurent Destailleur	671243e8f6	Fixed: Bugs reported by scrutinizer Fixed: Solve conflict between ->iban and ->iban_prefix.	2014-11-22 16:57:08 +01:00
Laurent Destailleur	80e62697f0	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/bank/treso.php	2014-11-18 19:01:01 +01:00
Laurent Destailleur	01279edfc8	Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank planned transactions.	2014-11-16 16:36:32 +01:00
aspangaro	c256243bf7	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-16 08:41:39 +01:00
Laurent Destailleur	445f696d28	Fix: Pb of object with wrong type.	2014-11-15 18:24:38 +01:00
aspangaro	c70539b3b2	Bug & merge	2014-11-12 07:33:03 +01:00
Florian HENRY	9c795d2c4b	Finnish bank extrafeilds	2014-11-10 13:18:27 +01:00
Florian HENRY	e9f754395d	Start bank extrafields	2014-11-10 13:09:58 +01:00
aspangaro	cbfa90abca	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 20:57:05 +01:00
aspangaro	25433120e6	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 06:16:03 +01:00
aspangaro	10ed271e38	Search bank transactions	2014-11-02 20:18:46 +01:00
Laurent Destailleur	7a68d9a940	Miscellaneous fixes	2014-10-16 20:55:13 +02:00
aspangaro	7e11fa06bb	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-10-05 16:35:38 +02:00
Laurent Destailleur	97eec37f1c	Uniformize code: property "nom" for thirdparty is aliased into "name" everywhere.	2014-10-04 17:20:17 +02:00
aspangaro	3627f157d2	Add langs & debug	2014-10-01 07:16:29 +02:00
aspangaro	1592968709	Merge remote-tracking branch 'Upstream/develop' into develop	2014-09-20 06:42:31 +02:00
Laurent Destailleur	ee4d697172	Fix several bugs reported by scrutinizer	2014-09-19 14:57:31 +02:00
Laurent Destailleur	ca3c5d9513	Fix: invalid list of params Fix: loading of sql menu	2014-09-19 14:36:55 +02:00
Raphaël Doursenaud	eea9a76589	FIX: Variable might not be traversable	2014-09-19 03:07:52 +02:00
aspangaro	0b20369dd7	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
Laurent Destailleur	83447243ae	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: build/debian/get-orig-source.sh htdocs/product/class/product.class.php htdocs/societe/soc.php	2014-09-15 22:58:39 +02:00
Laurent Destailleur	05f3a47018	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: build/debian/control htdocs/compta/bank/account.php htdocs/fourn/paiement/fiche.php htdocs/product/class/product.class.php htdocs/product/fiche.php	2014-09-15 22:52:59 +02:00
Marcos García de La Fuente	7bac9444e6	[ bug #1546 ] Incorrect page number when searching in the list of bank transactions	2014-09-14 14:32:17 +02:00
Laurent Destailleur	f264e25514	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/adherents/liste.php htdocs/compta/bank/bankid_fr.php htdocs/holiday/index.php htdocs/opensurvey/list.php	2014-09-13 19:10:05 +02:00
Laurent Destailleur	8dd9358214	Fix: SQL injection	2014-09-13 19:04:25 +02:00
aspangaro	fa6941efc6	Merge branch 'Upstream/develop'	2014-09-04 04:23:19 +02:00
aspangaro	2cba7ab9e6	Card presentation	2014-09-04 04:22:43 +02:00
Laurent Destailleur	1eaf615426	Fix: no br after title	2014-09-03 14:32:59 +02:00
aspangaro	0738103da8	Renamed llx_c_pays to llx_c_country & field "libelle" to "label"	2014-08-10 13:37:39 +02:00
Laurent Destailleur	605919be76	Fix: Too many parameter Fix: Can't delete bank account	2014-08-01 14:51:40 +02:00
Laurent Destailleur	07cf09536d	Fix: delete bank account	2014-08-01 14:48:48 +02:00
Laurent Destailleur	bb8ec0c8f9	Fix: Too many parameter	2014-08-01 14:26:13 +02:00
Marcos García de La Fuente	4f4ac30fc0	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00

... 14 15 16 17 18 ...

2491 Commits