2491 Commits

Author	SHA1	Message	Date
Laurent Destailleur	526ae83e8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-19 19:49:16 +01:00
Laurent Destailleur	e679e05f57	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-19 19:49:04 +01:00
Laurent Destailleur	19ab802aaf	Fix disabling of balance	2020-01-19 19:48:19 +01:00
Laurent Destailleur	d6bdbccf4f	Fix link	2020-01-19 19:33:57 +01:00
Laurent Destailleur	178dd518cf	Merge branch 'develop' into scrutinizer-patch-5	2020-01-18 19:36:36 +01:00
Scrutinizer Auto-Fixer	8744f6ab7b	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-18 15:17:07 +00:00
Laurent Destailleur	73d56358e1	Fix bad param	2020-01-18 16:13:10 +01:00
Laurent Destailleur	4e4a810484	Merge pull request #12368 from aspangaro/11.0_a5 ... NEW Various payment list - Add search date start & date end & subledger account	2020-01-15 17:51:59 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	9ebdd82edb	Fix We must refuse to delete a various payment if payment was dispatched ... in accountancy.	2020-01-10 02:43:24 +01:00
Laurent Destailleur	675ce3b32f	Fix sql error on update of subledger account on a various payment ... Fix warning message that was not accurate	2020-01-10 02:20:08 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Alexandre SPANGARO	f14aaf5e50	FIX Some problems on conciliation with others modules	2020-01-03 16:35:02 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Laurent Destailleur	8202a67e4e	Fix look and feel v11	2019-12-25 23:15:56 +01:00
Alexandre SPANGARO	ab0f77b467	Merge remote-tracking branch 'upstream/develop' into 11.0_a5	2019-12-23 21:15:17 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Laurent Destailleur	9685b56375	Fix warning	2019-12-15 15:03:22 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Laurent Destailleur	8fbaae3fef	Merge pull request #12694 from frederic34/patch-8 ... doxygen	2019-12-14 13:43:47 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	9357bfd98e	doxygen	2019-12-12 08:17:14 +01:00
Frédéric FRANCE	269e53583d	doxygen	2019-12-11 23:46:12 +01:00
Laurent Destailleur	5454380834	CSS	2019-12-11 19:14:41 +01:00
Scrutinizer Auto-Fixer	4debd71281	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-06 08:26:49 +00:00
Frédéric FRANCE	d9bfa62367	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-05 21:47:42 +01:00
Laurent Destailleur	5f148be56f	Fix responsive	2019-12-04 16:43:56 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer	5f99e25c45	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-28 11:36:20 +00:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Alexandre SPANGARO	0f6de0049c	Fix	2019-11-26 21:17:22 +01:00
Alexandre SPANGARO	d910b05a38	Look & Feel v11	2019-11-26 20:28:24 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
Frédéric FRANCE	f3f308fc1b	Update graph.php	2019-11-26 00:11:02 +01:00
Laurent Destailleur	f9092b1b8e	Fix responsive	2019-11-20 13:22:40 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Alexandre SPANGARO	1e2fd1f25a	Merge remote-tracking branch 'upstream/develop' into 11.0_a5	2019-11-17 21:55:25 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. ... Fix remove empty id	2019-11-16 14:38:05 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Frédéric FRANCE	446c66da62	use class CONST	2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer	df664e790b	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 23:15:34 +00:00
Laurent Destailleur	2ccef4e469	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php	2019-11-11 19:10:35 +01:00
Laurent Destailleur	4fce0d3e7a	Fix not transversable	2019-11-08 15:52:57 +01:00
Scrutinizer Auto-Fixer	2ecfe41810	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 09:53:31 +00:00
Laurent Destailleur	c0b8684475	Merge pull request #12341 from inoveaconseil/bankStatementDocument ... NEW add upload for account statement	2019-11-07 15:06:47 +01:00
Laurent Destailleur	5a4a421a8e	FIX #12372	2019-11-07 13:07:40 +01:00
Alexandre SPANGARO	b85dc0c5e5	NEW Various payment list - Add search date start & date end & subledger_account	2019-11-07 09:19:48 +01:00
Nicolas	f18bca7687	Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument	2019-11-06 20:51:17 +01:00
Nicolas	4143988614	NEW Add upload document on account statement	2019-11-06 20:50:02 +01:00
Inovea Conseil	fed6ed8760	Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument	2019-11-06 20:48:24 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
stickler-ci	f537ae60b6	Fixing style errors.	2019-11-05 12:52:58 +00:00
Nicolas	991e1b2747	NEW Add upload document on account statement	2019-11-05 13:51:52 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	ec8bd6327d	Fix css	2019-11-04 18:53:46 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
Laurent Destailleur	89f1904793	Finish removing of ->attribute_label	2019-11-02 17:26:26 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid ... replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	a1f0245c79	clean indent in compta, contact directory	2019-10-26 18:13:20 +02:00
Frédéric FRANCE	79825e2193	start clean indent in compta directory	2019-10-26 14:42:25 +02:00
Laurent Destailleur	b4eb14ee44	Use dolGetStatus	2019-10-24 16:43:23 +02:00
Laurent Destailleur	9a386da7f5	NEW Can crop/resize image attached on a bank record	2019-10-23 16:07:09 +02:00
Laurent Destailleur	31ad147e0e	Look and feel v11	2019-10-23 15:17:01 +02:00
Laurent Destailleur	02f559db5f	Use GETPOST	2019-10-23 15:07:21 +02:00
Laurent Destailleur	564f96c092	Fix scrutinizer warnings	2019-10-23 14:59:02 +02:00
Laurent Destailleur	b88968520b	Move code of extrafields to the new architecture	2019-10-22 17:08:37 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Laurent Destailleur	ebd8bc3645	Merge pull request #12107 from frederic34/patch-14 ... Update list.php	2019-10-14 20:57:01 +02:00
Frédéric FRANCE	b424fc6e27	Update list.php	2019-10-12 18:57:08 +02:00
Frédéric FRANCE	cef935468d	Update list.php	2019-10-12 18:40:39 +02:00
Laurent Destailleur	bcc41c2a33	NEW Can filter on description on bank account transaction lists.	2019-10-12 13:19:10 +02:00
Laurent Destailleur	5970ea5b79	Update releve.php	2019-10-08 15:48:29 +02:00
Laurent Destailleur	d6bf0fa483	Update releve.php	2019-10-08 15:47:47 +02:00
fuhraih	368b34c5c2	FIX #11835 ... FIX #11835 edit Bank Statements in second Page and so on not working	2019-10-08 15:34:35 +02:00
Laurent Destailleur	43a70e5548	Clean code to use the new $extrafields->attributes array	2019-10-08 09:28:50 +02:00
Laurent Destailleur	c2a7ae23bc	Merge pull request #12034 from aspangaro/11_faicon ... Fix Fa-icon	2019-10-07 13:03:27 +02:00
Laurent Destailleur	52c06c1815	Fix css	2019-10-06 19:28:08 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Alexandre SPANGARO	14381927c7	Fix Bank Fa-icon	2019-10-03 20:32:15 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Laurent Destailleur	41a2a25729	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/ligne.php	2019-09-17 12:23:58 +02:00
Laurent Destailleur	5233e7d8ad	FIX do not output return code on screen after a select of bank account	2019-09-16 18:29:04 +02:00
Laurent Destailleur	6bfba0b731	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php	2019-09-15 15:17:38 +02:00
Alexandre SPANGARO	21e27389d4	NEW Bank Add an option for colorize background color of debit or credit movement	2019-09-14 20:58:12 +02:00
Alexandre SPANGARO	4420af683d	Fix Bank entries - nowrap on amount	2019-09-14 05:44:28 +02:00
Laurent Destailleur	481a25cb8f	The hook "moreFamily" must return payment into var "totalpayment" and no ... more "paiement" (english replace french).	2019-09-03 17:39:19 +02:00
Laurent Destailleur	da3d230182	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .stickler.yml htdocs/takepos/invoice.php	2019-09-03 17:34:49 +02:00
Laurent Destailleur	84800257e8	Merge pull request #11799 from jtraulle/fix-11683-10.0 ... Fix #11682 Missing origin object ref and thirdparty ref in future ban…	2019-09-03 17:32:47 +02:00
Laurent Destailleur	7c07e64adc	Update treso.php	2019-09-03 17:32:18 +02:00
Laurent Destailleur	65fee73b22	Update treso.php	2019-09-03 17:31:20 +02:00
Jean Traullé	8f1fba6775	Fix #11682 Missing origin object ref and thirdparty ref in future bank entries	2019-08-30 23:56:52 +02:00
Laurent Destailleur	999db7ed41	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php	2019-08-26 16:49:25 +02:00
Alexandre SPANGARO	76691925a4	FIX Missing div for buttons in tax, loan, various payment modules	2019-08-26 15:35:20 +02:00
Laurent Destailleur	3339f89fc5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/api/class/api_login.class.php htdocs/dav/fileserver.php	2019-08-22 12:45:23 +02:00
Laurent Destailleur	27cd6cd308	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/compta/paiement.php htdocs/product/fournisseurs.php htdocs/stripe/payment.php	2019-08-22 12:39:07 +02:00
Laurent Destailleur	a35f010e55	FIX name and position of hook FIX #11710	2019-08-22 12:30:14 +02:00
Laurent Destailleur	6abfd8b145	Fix use short labels for workboard	2019-08-19 10:01:42 +02:00
Laurent Destailleur	c989a63360	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/langs/en_US/cashdesk.lang	2019-08-18 20:54:06 +02:00
Laurent Destailleur	f27bea9497	Fix phpcs	2019-08-18 20:39:02 +02:00
Laurent Destailleur	ad5f2dbe9d	Fix update on id	2019-08-18 18:56:58 +02:00
Laurent Destailleur	8cf0671804	FIX Missing transaction	2019-08-18 18:56:21 +02:00
Jean Traullé	e0310b5d9b	Fix #11682 Missing origin object ref and thirdparty ref in future bank entries	2019-08-16 11:38:42 +02:00
Jean Traullé	6edf5494c3	Added @throws annotations for possible exceptions	2019-08-15 15:29:37 +02:00
Jean Traullé	f37b8c78c8	NEW Add POST /bankaccounts/transfer REST API endpoint. ... This allow internal transfers between two bankaccounts.	2019-08-15 15:18:09 +02:00
Frédéric FRANCE	aa462bac23	Add empty index.html	2019-08-09 09:25:48 +02:00
Laurent Destailleur	4833c2bf49	Merge	2019-07-22 18:50:17 +02:00
Alexandre SPANGARO	5f042cf6ad	QUAL Move ligne.php to line.php	2019-07-19 23:19:06 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Laurent Destailleur	ee109ac568	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-05 17:44:50 +02:00
Laurent Destailleur	675b7b2e32	Fix link to reconcile	2019-07-05 13:11:30 +02:00
Laurent Destailleur	575dce2dff	Fix css	2019-07-05 12:17:36 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
Laurent Destailleur	d47cf87c00	Look and feel v10	2019-06-20 17:59:28 +02:00
Laurent Destailleur	afb6362317	Fix look and feel v10 ... Fix link to direct debit payment order	2019-06-20 13:37:06 +02:00
Laurent Destailleur	e060af5c97	Update treso.php	2019-06-20 02:50:23 +02:00
Alexandre SPANGARO	a849fbe42e	Nowrap on amount	2019-06-19 07:15:52 +02:00
Laurent Destailleur	475f59cc2a	Update annuel.php	2019-06-12 13:10:17 +02:00
Laurent Destailleur	9d95812495	Update bankentries_list.php	2019-06-12 13:08:26 +02:00
Alexandre SPANGARO	6d43efb4a2	Align right	2019-06-09 16:35:45 +02:00
Alexandre SPANGARO	8c5a01dd90	Show total with decimals	2019-06-09 08:56:49 +02:00
Alexandre SPANGARO	33b02b97d5	Better look	2019-06-09 08:50:20 +02:00
Laurent Destailleur	bc030561ac	Debug various payment	2019-05-29 13:48:00 +02:00
Laurent Destailleur	280a034199	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-29 13:15:57 +02:00
Laurent Destailleur	a7dccf1617	Merge pull request #11255 from aspangaro/10.0_accountancy2 ... FIX Lost functionnality - Add category to bank transaction with various payment	2019-05-29 13:15:47 +02:00
Laurent Destailleur	cafb3840b7	Fix look and feel v10	2019-05-29 12:56:11 +02:00
Laurent Destailleur	6a84dfe29e	Update card.php	2019-05-29 12:34:54 +02:00
Alexandre SPANGARO	19b275f2d1	Fix bankline cat with various payment	2019-05-26 22:33:35 +02:00
Laurent Destailleur	b81c3a6d2b	Fix look and feel v10	2019-05-26 18:23:30 +02:00
Alexandre SPANGARO	ea13657617	Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2	2019-05-26 14:23:47 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button ... NEW : look and feel title button	2019-05-18 16:04:47 +02:00
John BOTELLA	f296093f8d	fix travis	2019-05-10 15:52:46 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All ... methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Alexandre SPANGARO	9210a39f6a	Merge branch 'develop' into 10.0_accountancy2	2019-04-24 21:49:41 +02:00
Laurent Destailleur	6da42941a8	NEW Add attached document on bank account visible in automatic ECM.	2019-04-21 19:54:30 +02:00
Laurent Destailleur	8310e09786	Fix td balance	2019-04-17 01:18:02 +02:00
John BOTELLA	a60d4b3b52	Appli btn apply to links	2019-04-16 09:09:25 +02:00
John BOTELLA	7372e8c610	Appli function to links	2019-04-15 15:47:36 +02:00
Laurent Destailleur	d7f980fda0	NEW Add picto of deletion on mass action combo lists	2019-04-09 01:22:59 +02:00
Laurent Destailleur	42fda54edf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/fichinter/list.php htdocs/product/stock/replenish.php	2019-04-02 19:41:58 +02:00
Laurent Destailleur	c5348be337	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-02 19:35:42 +02:00
Laurent Destailleur	17a61b3232	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-02 19:34:49 +02:00
Laurent Destailleur	8fe1be1a67	Removed deprecated use of string in dol_print_date(). Only date allowed.	2019-04-01 19:27:34 +02:00
Laurent Destailleur	143cbba09b	Update card.php	2019-03-31 18:49:38 +02:00
Alexandre SPANGARO	5588fe5b81	FIX: Don't show journal:getNomUrl without data ... ErrorBadValueForParamNotAString	2019-03-30 09:42:13 +01:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Laurent Destailleur	ee4150665e	Fix phpcs	2019-03-21 20:15:19 +01:00
Philippe GRAND	86c3b1a5b0	add some comments	2019-03-21 14:59:21 +01:00
Laurent Destailleur	f3cf3482fa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/projet/element.php	2019-03-18 10:23:14 +01:00
Laurent Destailleur	34034787af	FIX problem with sign of various payment in project preview	2019-03-18 10:16:08 +01:00
Alexandre SPANGARO	ad485b55b6	NEW: Add category to bank transaction in various payment	2019-03-10 20:01:39 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Frédéric FRANCE	62501b11e8	add visibility	2019-03-02 00:14:22 +01:00
Frédéric FRANCE	4f341ea022	replace html code by html5	2019-02-23 22:56:38 +01:00
Alexandre SPANGARO	7e60c3bf84	FIX: In various payment, subledger & accout may be alphanumeric	2019-02-12 16:27:25 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
Laurent Destailleur	6f6a767255	Merge pull request #10520 from aspangaro/develop ... NEW: Add subledger in various payment	2019-02-12 13:20:58 +01:00
Laurent Destailleur	5c01ec158d	Fix regression	2019-02-11 15:40:33 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Frédéric FRANCE	580e5c42d2	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +01:00
Alexandre SPANGARO	2ba8ae00e4	Merge remote-tracking branch 'upstream/develop' into develop	2019-02-06 21:56:01 +01:00
Alexandre SPANGARO	a28c926f03	Fix	2019-02-06 21:43:16 +01:00
Philippe GRAND	386a4102b7	update with html5 compliant code	2019-02-04 13:44:02 +01:00
Philippe GRAND	b7605e233e	update with html5 compliant code	2019-02-04 13:40:00 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Alexandre SPANGARO	13cf3b1d7f	Add subledger in various payment	2019-02-01 15:50:12 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	adb7ec7015	Merge pull request #10399 from grandoc/new_branch_23_01_2019 ... update with html5 compliant code	2019-01-26 14:02:26 +01:00
Philippe GRAND	7c086ba8ed	update with html5 compliant code	2019-01-24 10:02:06 +01:00
Philippe GRAND	1599f165ee	update with html5 compliant code	2019-01-24 09:57:39 +01:00
Philippe GRAND	7ff1555e58	update with html5 compliant code	2019-01-23 17:39:40 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime ... Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Philippe GRAND	68c6ccae22	update with html5 compliant code	2019-01-18 10:06:45 +01:00
Laurent Destailleur	58bda12e22	css	2019-01-17 19:31:01 +01:00
Laurent Destailleur	8d4d1dbf99	Fix phpcs	2019-01-16 18:51:51 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
Laurent Destailleur	d9999d61f6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 12:27:25 +01:00
Laurent Destailleur	890abd28d5	Fix look and feel v9	2019-01-09 12:26:49 +01:00
ldestailleur	451b3e30cc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/langs/en_US/cashdesk.lang	2019-01-04 19:36:20 +01:00
Alexandre SPANGARO	c4dbf41530	Look & feel	2018-12-30 21:21:40 +01:00
Laurent Destailleur	eb66d45947	Merge branch 'develop' into 10.0_accoutancy_stats	2018-12-15 15:17:15 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	21b3bbc2e6	Merge	2018-12-08 11:55:27 +01:00
Laurent Destailleur	a915d82883	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-08 11:42:30 +01:00
Laurent Destailleur	5ce26bae1b	Fix form of bank info for CH	2018-12-04 22:01:35 +01:00
Laurent Destailleur	275eeca135	Trans	2018-12-04 13:09:58 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Alexandre SPANGARO	088c002ed1	NEW: Add stats on entries & movements by fiscal year	2018-12-02 11:01:11 +01:00
Laurent Destailleur	ed1062c440	Css	2018-11-25 11:59:49 +01:00
atm-quentin	a0d5607ba5	FIX error travis	2018-11-16 15:29:05 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	e004fc2f5b	FIX block page if cant fetch	2018-11-16 11:17:34 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Frédéric FRANCE	fe5056add8	remove fieldlabel and add fieldeditkey	2018-10-27 18:07:05 +02:00
Frédéric FRANCE	42a9abad56	remove fieldlabel and add fieldeditkey	2018-10-27 17:45:29 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Laurent Destailleur	087b68948d	Fix: do not use point for graph with too many points.	2018-10-26 17:32:32 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	f8316abfc0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/theme/md/style.css.php	2018-10-24 02:58:29 +02:00
Laurent Destailleur	919c4fc5bc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/theme/md/style.css.php	2018-10-24 02:40:57 +02:00
Laurent Destailleur	c8aa884462	Fix search all	2018-10-23 17:16:46 +02:00
Laurent Destailleur	99fde00902	Merge pull request #9719 from frederic34/patch-11 ... do not trim int	2018-10-12 17:35:04 +02:00
Laurent Destailleur	7f1aa217a6	Fix link	2018-10-10 18:38:53 +02:00
Laurent Destailleur	82e06eda75	FIX save search criteria when going on receipt from bank transaction	2018-10-10 18:33:32 +02:00
Laurent Destailleur	6446343e1b	Fix sort lost	2018-10-10 13:05:19 +02:00
Laurent Destailleur	cb29209457	NEW Enhancement in process to make manual bank conciliation	2018-10-10 12:47:18 +02:00
Laurent Destailleur	562ee1cb64	FIX checkbox to conciliate not visible if bank receipt nb known	2018-10-10 12:19:22 +02:00
Frédéric FRANCE	03fcc2f088	Update paymentvarious.class.php	2018-10-09 20:31:14 +02:00
Frédéric FRANCE	b917fd0cf2	do not trim int	2018-10-09 19:41:53 +02:00
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