2517 Commits

Author	SHA1	Message	Date
Alexandre SPANGARO	fbd7dc66b2	Fix error	2020-03-03 05:06:31 +01:00
Laurent Destailleur	c47ddb8bca	Merge pull request #13245 from aspangaro/12.0_a19 ... NEW: Bookkeeping - Add link to document & pdf	2020-03-02 21:44:27 +01:00
Alexandre SPANGARO	cdca4ca0aa	NEW: Bookkeeping - Add link to document & pdf	2020-03-02 09:01:25 +01:00
Alexandre SPANGARO	be8ed42450	NEW: Bookkeeping - Add link to document & pdf	2020-03-01 23:17:40 +01:00
Alexandre SPANGARO	6982997de5	Fix error	2020-03-01 05:09:57 +01:00
Alexandre SPANGARO	d9b9913e8a	NEW: Accountancy - Add mode intra & export for product or service bought	2020-03-01 04:52:12 +01:00
Laurent Destailleur	f2dba4f621	Merge pull request #13227 from aspangaro/12.0_a16 ... NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality	2020-02-29 13:02:43 +01:00
Laurent Destailleur	8879672122	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-29 12:52:18 +01:00
Laurent Destailleur	0855598c00	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/lib/functions.lib.php	2020-02-29 12:51:33 +01:00
Laurent Destailleur	c3ab1055bf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-29 12:48:40 +01:00
Laurent Destailleur	52a92924de	Merge pull request #13230 from atm-gauthier/fix_round_accountancy ... FIX : round MT in accountancy books	2020-02-29 12:35:33 +01:00
gauthier	284a4189b3	FIX : round MT in accountancy books	2020-02-28 14:32:35 +01:00
Alexandre SPANGARO	86d9622360	NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality	2020-02-27 10:44:04 +01:00
Laurent Destailleur	9f097b1a08	FIX #13146 #13198	2020-02-26 15:45:21 +01:00
Laurent Destailleur	1583bed0e4	FIX #13146 #13198	2020-02-26 15:41:46 +01:00
Laurent Destailleur	d172a95dfe	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-25 14:37:04 +01:00
Laurent Destailleur	2067abdc7e	Fix title of page	2020-02-24 23:10:04 +01:00
Laurent Destailleur	2118c2eede	Fix missing title line	2020-02-24 23:04:17 +01:00
Laurent Destailleur	4b4d1bcce2	Fix disable accountancy chart that is deprecated.	2020-02-24 03:05:58 +01:00
Philippe GRAND	95228ae01c	fix merging	2020-02-22 12:21:17 +01:00
Scrutinizer Auto-Fixer	e44865d8b5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-21 16:53:37 +00:00
Scrutinizer Auto-Fixer	fd48877dc6	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-18 22:47:25 +00:00
Laurent Destailleur	a6b0fec90b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/exports/class/export.class.php	2020-02-17 12:35:34 +01:00
Laurent Destailleur	504a67daee	FIX duplicate class name into some log lines	2020-02-17 12:34:00 +01:00
Laurent Destailleur	f4f3efec62	Fight against $_POST	2020-02-16 19:33:58 +01:00
Laurent Destailleur	a312adf2b0	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php	2020-02-14 19:57:31 +01:00
Laurent Destailleur	d3d572c8d3	FIX Avoid to download the export if we just press enter to refresh form	2020-02-14 19:55:50 +01:00
Laurent Destailleur	a7df72ee6f	FIX #13067	2020-02-14 19:34:26 +01:00
Laurent Destailleur	58a2a71605	Merge pull request #13067 from maboelfotoh/custom ... NEW add Opening Balance column to balance.php	2020-02-14 19:25:18 +01:00
Laurent Destailleur	35ada37d4d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/comm/propal/list.php htdocs/filefunc.inc.php	2020-02-14 19:14:26 +01:00
Laurent Destailleur	58ad62aa7b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-02-14 19:12:11 +01:00
Laurent Destailleur	3bc122ecf6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-14 19:05:58 +01:00
Laurent Destailleur	3faed758b3	FIX #13110	2020-02-14 19:05:39 +01:00
Laurent Destailleur	4d29cb17de	FIX #13110	2020-02-14 19:04:08 +01:00
Alexandre SPANGARO	72e59e6fe2	FIX: Force FEC export to txt format	2020-02-14 16:07:06 +01:00
Muhammad Aboelfotoh	ce6cf04028	Add new view for balance.php that additionally shows opening balance	2020-02-13 13:53:07 +00:00
Laurent Destailleur	4762bafb02	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php htdocs/mrp/class/mo.class.php	2020-02-12 22:58:37 +01:00
Laurent Destailleur	ccced09113	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/adherents/subscription/list.php htdocs/comm/propal/list.php htdocs/core/class/html.formmail.class.php	2020-02-12 22:54:55 +01:00
Laurent Destailleur	7931734ecb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modUser.class.php	2020-02-12 20:30:20 +01:00
Laurent Destailleur	50f0b61f1e	Update bankjournal.php	2020-02-12 18:50:33 +01:00
Laurent Destailleur	ccb895e251	Merge pull request #13083 from atm-greg/FIX_bookkeeping_LD_Compta_Export ... fix missing fields in LD Compta Export	2020-02-12 18:41:34 +01:00
Laurent Destailleur	03a8414ba8	FIX #13085	2020-02-12 18:21:45 +01:00
Pierre Ardoin	c7181830fc	Fix the display of the banner with multicompany ... Before : if a account of a entity require to define the Journal code, Banner displayed in all entities. Now : Show the banner only in the entity concerned.	2020-02-12 09:11:39 +01:00
stickler-ci	fc170c1081	Fixing style errors.	2020-02-11 15:20:46 +00:00
atm-greg	66f6d1bfd4	add missing fields	2020-02-11 15:57:49 +01:00
Laurent Destailleur	2e0929c2e9	FIX export ledger	2020-02-05 16:08:28 +01:00
Laurent Destailleur	e81bcbde31	FIX export ledger	2020-02-05 16:08:00 +01:00
Laurent Destailleur	8098456f67	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-03 02:52:46 +01:00
Laurent Destailleur	d4c16c6590	Merge pull request #12981 from oscim/patch-17 ... Update thirdparty_lettering_supplier.php	2020-02-02 20:01:47 +01:00
Alexandre SPANGARO	e8b9ca3276	FIX: FEC export have specific name	2020-02-01 08:23:19 +01:00
Alexandre SPANGARO	0229cd3c65	FIX: FEC export have specific name	2020-02-01 08:18:48 +01:00
oscim	ed68ae0574	Update thirdparty_lettering_supplier.php ... fix form in fiscalyear lasted validated	2020-01-31 08:50:41 +01:00
oscim	a0d3370b86	Update lettering.class.php ... add check colum date_validated IS NULL for block process lettering in fiscalyear is lasted validated	2020-01-31 08:43:09 +01:00
Laurent Destailleur	b2d0b47ec9	Merge pull request #12970 from Dolibarr/scrutinizer-patch-6 ... Scrutinizer Auto-Fixes	2020-01-30 11:35:55 +01:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00:00
Laurent Destailleur	2791f10e18	Merge pull request #12934 from aspangaro/12.0_a10 ... NEW: Accountancy - General ledger - Add an option to search not reconciled line	2020-01-30 01:48:21 +01:00
Laurent Destailleur	7b10c2440b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-29 23:08:42 +01:00
Laurent Destailleur	af61c19ffd	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-01-29 23:06:21 +01:00
altairis	f1ea0ce5a1	better fix	2020-01-29 11:47:23 +01:00
altairis	b04bb9e392	FIX : fetching account on current entity	2020-01-29 11:05:10 +01:00
Alexandre SPANGARO	074e55fca5	NEW: Accountancy - General ledger - Add an option to search not reconciled line	2020-01-28 22:56:26 +01:00
Laurent Destailleur	9acda3545e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:52:01 +01:00
Laurent Destailleur	c87fdc96ce	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/accountancy/supplier/index.php	2020-01-28 17:51:32 +01:00
Laurent Destailleur	782be2ac37	FIX Invert isSellerInEEC and isBuyerInEEC	2020-01-28 17:50:08 +01:00
Laurent Destailleur	bffdc63ec6	FIX The "automatic bind" was linked EEC to export accountancy code ... Conflicts: htdocs/accountancy/supplier/index.php	2020-01-28 17:48:34 +01:00
Laurent Destailleur	86c10a124a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:44:53 +01:00
Laurent Destailleur	e9de1e16e8	FIX The "automatic bind" was linked EEC to export accountancy code	2020-01-28 17:44:05 +01:00
Laurent Destailleur	80707d6a5e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:24:26 +01:00
Laurent Destailleur	f5ce0fc811	Fix seach on country	2020-01-28 17:22:26 +01:00
Philippe GRAND	c736d9ae25	fix merging	2020-01-27 09:48:38 +01:00
Alexandre SPANGARO	d5ff006171	NEW: Accountancy - General ledger - Add an option to search not lettering line	2020-01-27 05:20:48 +01:00
Laurent Destailleur	27a0858050	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-23 17:41:31 +01:00
Laurent Destailleur	7ad827f212	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php	2020-01-23 12:09:01 +01:00
Laurent Destailleur	be344518c4	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/core/lib/functions2.lib.php	2020-01-23 12:07:17 +01:00
Alexandre SPANGARO	7f47b48559	Move function to functions2.lib.php	2020-01-23 11:47:30 +01:00
Alexandre SPANGARO	5eeef771fa	FIX: FEC export format	2020-01-23 06:20:31 +01:00
Laurent Destailleur	d329c4ad38	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-21 22:39:30 +01:00
Laurent Destailleur	69fae5a679	Fix search on accounting account when option to padd 0 is on.	2020-01-21 22:38:03 +01:00
Laurent Destailleur	c7617279de	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-21 22:27:00 +01:00
Laurent Destailleur	80648db7fc	Fix search on accounting account when option to padd 0 is on.	2020-01-21 22:26:37 +01:00
Laurent Destailleur	ff9a2608d8	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php	2020-01-21 22:22:16 +01:00
Laurent Destailleur	8f1737952d	Fix search on accounting account when option to padd 0 is on.	2020-01-21 22:20:32 +01:00
Laurent Destailleur	a36b0ea4f5	Fix filter on parent account in list of accounting accounts	2020-01-21 21:36:40 +01:00
Alexandre SPANGARO	f4cd3236b1	Fix : Accounting - error on right	2020-01-19 21:59:01 +01:00
Laurent Destailleur	5772dce460	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2020-01-15 12:09:21 +01:00
Laurent Destailleur	9ceec670b9	Fix date format in FEC export	2020-01-13 13:52:48 +01:00
Laurent Destailleur	22d4f37e58	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/html.form.class.php	2020-01-10 14:31:37 +01:00
Laurent Destailleur	b47db086cb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/inventory/class/inventory.class.php htdocs/product/inventory/list.php	2020-01-10 14:30:42 +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
Alexandre SPANGARO	c3518426bd	NEW Accountancy - Add possibility to manage an short alternative label - use to simplify	2020-01-03 22:05:49 +01:00
Laurent Destailleur	513b9b26a6	Merge branch 'develop' into 9.0_p4	2019-12-31 16:38:37 +01:00
Alexandre SPANGARO	77e3b01179	Fix Accountancy - Set NULL when data is empty	2019-12-31 08:00:20 +01:00
Laurent Destailleur	d1fdd11b37	Close #10907	2019-12-19 11:32:10 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	404ae0c209	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-17 02:00:52 +00:00
Laurent Destailleur	a3fa6eb473	Debug v11	2019-12-16 19:40:18 +01:00
Laurent Destailleur	5c8733a84b	More complete message	2019-12-16 19:30:18 +01:00
Laurent Destailleur	e3cc541ff2	Fix debug code	2019-12-16 19:19:37 +01:00
Laurent Destailleur	d22cd5c321	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/accountancy/bookkeeping/list.php	2019-12-16 19:09:53 +01:00
Laurent Destailleur	65abe7532c	Fix error message not reported when deleting record in ledger.	2019-12-16 19:05:32 +01:00
Laurent Destailleur	1af67a4336	Merge pull request #12713 from frederic34/doxygen_warning ... doxygen	2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Laurent Destailleur	fdf4d86d81	Debug code	2019-12-16 12:38:51 +01:00
Laurent Destailleur	646587a9cf	Value "None" To unbind is more visible.	2019-12-16 11:50:25 +01:00
Frédéric FRANCE	9e4fb8d4fe	doxygen	2019-12-15 10:02:20 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	66805a502a	doxygen	2019-12-11 22:53:57 +01:00
Philippe GRAND	9996c1ca7a	fix : invoid sql injection	2019-11-21 09:49:53 +01:00
Philippe GRAND	54d67de538	fix : invoid sql injection	2019-11-21 09:44:13 +01:00
Laurent Destailleur	5d7a1f1265	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang	2019-11-19 19:02:14 +01:00
Frédéric FRANCE	b61a3f1ba9	Update bookkeeping.class.php	2019-11-18 19:59:21 +01:00
Frédéric FRANCE	5c0976a778	doxygen accountancy class	2019-11-16 09:58:14 +01:00
Alexandre SPANGARO	3937b45c5f	Core - Fix accountancy write social contribution in bookkeeping (Need for FEC format)	2019-11-16 07:51:38 +01:00
Laurent Destailleur	0e3d90f145	Fix syntax error	2019-11-14 12:42:44 +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
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
Laurent Destailleur	614faa07c1	Merge pull request #12427 from Dolibarr/scrutinizer-patch-3 ... Scrutinizer Auto-Fixes	2019-11-14 08:49:53 +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	f4aaa8d9bb	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:34:37 +00:00
Laurent Destailleur	c02cd80b75	Clean code	2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Laurent Destailleur	4f7b698e92	Fix filter on sell/purchase status	2019-11-11 19:42:54 +01: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	5ae5b87b60	Fix get bad default value for accounting for sales export	2019-11-11 19:07:22 +01:00
Laurent Destailleur	8976bd7c9b	Fix setup of accounting account	2019-11-11 19:05:42 +01:00
Laurent Destailleur	f62f73f5cb	FIX Bad value suggested in default product account setup	2019-11-11 19:05:06 +01:00
Laurent Destailleur	40d66489ad	Trans	2019-11-11 13:47:17 +01:00
stickler-ci	11f29df93d	Fixing style errors.	2019-11-10 09:52:03 +00:00
Philippe GRAND	762b70fab7	add some comment	2019-11-10 10:51:16 +01:00
Laurent Destailleur	9423449237	Merge pull request #12308 from olibre/FIX_the_SELECT_examine_more_than_MAX_JOIN_SIZE_rows_12305 ... FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305	2019-11-07 11:26:50 +01:00
Laurent Destailleur	cb26567cfe	Revert option ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC into ... ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC	2019-11-07 11:17:53 +01:00
Laurent Destailleur	1ea8fed9c4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-07 11:16:20 +01:00
Laurent Destailleur	feef992d39	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-07 11:16:09 +01:00
Laurent Destailleur	de77e39e08	FIX #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC. ... Now autofill works, option can be reverted in v11.	2019-11-07 11:14:36 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	d6667675b4	Merge pull request #12336 from grandoc/new_branch_05_11_2019 ... fix bad setEventMessages	2019-11-05 10:07:07 +01:00
Philippe GRAND	4acc107191	fix bad setEventMessages	2019-11-05 10:01:21 +01:00
O. Libre	441eadb883	Check if mysqli to avoid perturbing PostgreSQL with "SET SQL_BIG_SELECTS=1"	2019-11-05 06:21:35 +01:00
O. Libre	729ed78063	FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305	2019-11-05 06:21:26 +01:00
Frédéric FRANCE	d059df1348	Update thirdparty_lettering_supplier.php	2019-11-04 22:51:15 +01:00
Frédéric FRANCE	5113e5e570	fix missing newtoken	2019-11-04 22:50:19 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +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	d232b7a387	Merge pull request #12286 from grandoc/new_branch_01_11_2019 ... add some comment	2019-11-02 13:00:23 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	c12e66e2a2	Merge branch 'develop' into new_branch_01_11_2019	2019-11-02 12:00:04 +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
Philippe Grand	3692a6602d	Update bookkeeping.class.php	2019-11-01 11:12:09 +01:00
stickler-ci	a8f7082a3a	Fixing style errors.	2019-11-01 09:36:18 +00:00
Philippe GRAND	5bafcae767	add some comment	2019-11-01 10:36:17 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Laurent Destailleur	be3f0471ff	Fix phpcs	2019-10-21 11:27:48 +02:00
Laurent Destailleur	febf9ccd04	FIX The Button "Automatic binding" did not use the account intracomm or ... export.	2019-10-21 05:24:54 +02:00
Laurent Destailleur	776bfabfc4	FIX If country not defined keep value empty	2019-10-21 05:24:42 +02:00
Laurent Destailleur	6ebd9721da	FIX The Button "Automatic binding" did not use the account intracomm or ... export.	2019-10-21 03:50:57 +02:00
Laurent Destailleur	9b1385ee86	FIX If country not defined keep value empty	2019-10-21 03:37:44 +02:00
Frédéric FRANCE	360bf55f5b	clean indent	2019-10-20 01:09:11 +02:00
Laurent Destailleur	63fad7dc07	Fix phpcs	2019-10-17 20:15:12 +02:00
Laurent Destailleur	b480301a37	Look and feel v11	2019-10-17 20:11:49 +02:00
Laurent Destailleur	87ec1de78e	Start to work on solution to sort permissions by module	2019-10-17 18:43:07 +02:00
Laurent Destailleur	40fdcfac7e	Merge branch 'develop' into 10.0_closure2	2019-10-17 18:16:57 +02:00
Laurent Destailleur	f85899742b	Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen ... Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-17 17:48:42 +02:00
Frédéric FRANCE	8761b46e21	Update bookkeeping.class.php	2019-10-16 22:31:34 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	7960c91955	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/theme/md/style.css.php	2019-10-16 17:27:41 +02:00
Laurent Destailleur	75a47eebe0	Fix Method fetchAll must NEVER be used for table with more than 1000 ... record	2019-10-16 16:17:51 +02:00
Alexandre SPANGARO	4bb1677079	Fix - Accountancy - Various payment - Subledger is not recovered in bank journal	2019-10-16 10:39:35 +02:00
Laurent Destailleur	a1c93cb2e6	MAIN_ACTIVATE_HTML5 is now always on now (so option removed). ... Look and feel v11	2019-10-15 02:45:12 +02:00
Laurent Destailleur	415379c4f2	Link show tutorial in middle	2019-10-15 00:27:09 +02:00
Laurent Destailleur	b276abea26	Fix missing token in form ... Fix date lost after search	2019-10-11 16:49:58 +02:00
Laurent Destailleur	b41f7274dd	Merge pull request #12085 from aspangaro/11.0_accounting ... NEW : Accountancy - List by account - Modify sortfield, nowrap on amo…	2019-10-11 16:39:09 +02:00
Laurent Destailleur	fbc4e3b441	Update listbyaccount.php	2019-10-11 16:37:10 +02:00
Laurent Destailleur	112a074c82	Merge pull request #12074 from aspangaro/11.0_LDcompta ... Update new LDCompta export	2019-10-11 15:53:10 +02:00
Laurent Destailleur	f82f4162c3	NEW Look and fill v11: Introduce CSS "trforbreak"	2019-10-10 22:42:23 +02:00
Laurent Destailleur	3bf6fac505	NEW Can filter on label on invoice in accounting vendor binding pages	2019-10-10 22:05:34 +02:00
Alexandre SPANGARO	d43f2bbfae	NEW : Accountancy - List by account - Modify sortfield, nowrap on amount and sum of sous-total	2019-10-10 11:44:21 +02:00
Laurent Destailleur	aebae5ff83	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/margins.lang htdocs/user/class/user.class.php	2019-10-10 10:37:17 +02:00
Alexandre SPANGARO	04dc9e957f	Update new LDCompta Export	2019-10-09 16:33:57 +02:00
Laurent Destailleur	9da1d5025b	FIX If product account not suggested during bind, it is not preselected	2019-10-09 03:15:29 +02:00
Laurent Destailleur	a9c844460b	Debug use of widget on Accounting home page	2019-10-07 14:39:29 +02:00
Laurent Destailleur	035da6a711	Merge pull request #11951 from aspangaro/11.0_accountancy_portal ... NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area	2019-10-07 14:24:22 +02:00
Laurent Destailleur	edfedbb818	FIX Load chart of account only if we click or select button "Load chart"	2019-10-06 21:13:55 +02:00
Laurent Destailleur	80c1a92872	FIX Load chart of account only if we click or select button "Load chart"	2019-10-06 21:11:29 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Alexandre SPANGARO	94179f712d	Update areacode	2019-10-02 08:58:25 +02:00
Alexandre SPANGARO	a6e429ff32	Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal	2019-10-02 08:49:00 +02:00
Alexandre SPANGARO	4d5547636d	Accountancy FAQ - Move to toggle()	2019-10-02 08:43:35 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Alexandre SPANGARO	f91513937a	Remove option to hide FAQ	2019-09-30 21:37:20 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon ... NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	8e42ac8cd0	Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal	2019-09-28 22:31:08 +02:00
Laurent Destailleur	6966651d51	Standardize code to use dolSqlDateFilter	2019-09-28 13:22:05 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	a005408d83	NEW Accountancy - Add an option to hide FAQ on index and add widget in area	2019-09-23 20:42:50 +02:00
Laurent Destailleur	9f6fe0bf5a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/orders.lang	2019-09-14 18:27:58 +02:00
Laurent Destailleur	f45abc1b2a	Removed useless header	2019-09-14 18:26:38 +02:00
Laurent Destailleur	584549df11	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/index.php	2019-09-14 18:25:31 +02:00
Laurent Destailleur	697b25aa82	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-09-14 18:24:00 +02:00
Laurent Destailleur	56e070cd7f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/accountancy/index.php	2019-09-14 18:23:20 +02:00
Frédéric FRANCE	00394493eb	Update index.php	2019-09-12 22:02:39 +02:00
Laurent Destailleur	61cf47aa16	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-10 00:14:07 +02:00
Laurent Destailleur	a5f7211730	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/install/repair.php	2019-09-06 16:10:55 +02:00
Laurent Destailleur	e3fe3d7d4f	Fix missing var	2019-08-31 13:17:40 +02:00
Laurent Destailleur	defc0a6080	Fix missing property	2019-08-31 13:15:05 +02:00
Laurent Destailleur	3be635a9bc	Fix bad var name	2019-08-31 02:41:40 +02:00
Alexandre SPANGARO	14b9460de0	FIX Sens of the balance (Debit - Credit in accountancy not contrary)	2019-08-29 16:27:25 +02:00
Laurent Destailleur	d304749eca	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-19 10:19:14 +02:00
Laurent Destailleur	21fc089f58	FIX Translation of month	2019-08-19 10:18:38 +02:00
Laurent Destailleur	477384105f	FIX missing test on permission on button to delete ledger record	2019-08-18 19:25:36 +02:00
Laurent Destailleur	86d39b435b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-12 02:42:11 +02:00
Laurent Destailleur	e21d6289ea	FIX Can't add a new chart of account	2019-08-10 02:09:59 +02:00
Laurent Destailleur	22575bb6e7	Fix travis	2019-08-04 13:08:38 +02:00
Laurent Destailleur	a03771ce61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 16:30:40 +02:00
Laurent Destailleur	3d8f6dca76	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 16:30:32 +02:00
atm-quentin	2e3d700ef5	NEW export livre Charlemagne	2019-08-01 15:19:11 +02:00
Laurent Destailleur	dfc2bebbb6	FIX #11400	2019-08-01 13:27:07 +02:00
Laurent Destailleur	dca775985f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-30 20:55:41 +02:00
Laurent Destailleur	34f78c555d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-30 20:55:35 +02:00
Laurent Destailleur	192fb45ce7	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/accountancy/bookkeeping/list.php htdocs/adherents/card.php htdocs/compta/sociales/list.php htdocs/compta/sociales/payments.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/holiday/class/holiday.class.php htdocs/viewimage.php	2019-07-30 20:55:15 +02:00
Laurent Destailleur	334e1a6737	Merge pull request #11583 from aspangaro/11.0_LDcompta ... NEW Accountancy Add export model LDCompta V9 & higher	2019-07-30 15:59:43 +02:00
Alexandre SPANGARO	96380f01c6	Test in progress	2019-07-29 15:41:53 +02:00
Alexandre SPANGARO	56f124844c	Test in progress	2019-07-29 10:04:28 +02:00
Alexandre SPANGARO	bb168d7f54	Merge branch '9.0' into 9.0_FEC	2019-07-29 06:54:48 +02:00
Alexandre SPANGARO	cd22cc70c8	FIX FEC Format - Save translation of the journal	2019-07-29 06:41:51 +02:00
Alexandre SPANGARO	a2fc3689da	Nowrap on amount	2019-07-28 22:59:43 +02:00
Laurent Destailleur	a46bfc7a29	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/project.lib.php	2019-07-25 17:54:14 +02:00
Laurent Destailleur	4a8377e4fd	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-25 17:52:40 +02:00
Laurent Destailleur	6e3fad8f83	Fix phpcs	2019-07-25 17:42:44 +02:00
Alexandre SPANGARO	2162f2331d	Try to fix travis	2019-07-24 06:57:42 +02:00
Laurent Destailleur	f5afc50067	Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries	2019-07-22 18:47:35 +02:00
Alexandre SPANGARO	7bdfd83288	FIX FEC Format - Missing date_creation in general ledger when you add a new transaction	2019-07-22 15:15:08 +02:00
Laurent Destailleur	865ebb9de2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/ticket/class/ticket.class.php	2019-07-20 13:29:10 +02:00
Alexandre SPANGARO	0af1206892	Merge branch 'develop' into 11.0_salaries	2019-07-19 23:11:06 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Laurent Destailleur	94f0634492	Fix empty link	2019-07-19 21:45:11 +02:00
Alexandre SPANGARO	df73345046	NEW Accountancy Add export model LDCompta V9 & higher	2019-07-19 17:07:55 +02:00
Laurent Destailleur	1053a9d955	Trans	2019-07-19 16:49:12 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	6c23154a91	FIX #11506	2019-07-15 22:59:18 +02:00
Laurent Destailleur	cf00ae971a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-15 22:45:29 +02:00
Laurent Destailleur	e396824133	FIX #11507	2019-07-15 19:08:57 +02:00
Laurent Destailleur	5778a02ee1	FIX #11505	2019-07-15 18:44:33 +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	9b32763919	Fix label for report n ledger for transitionnal bank account on tranfer	2019-07-05 15:25:29 +02:00
Alexandre SPANGARO	59f8fb77da	Travis	2019-06-26 13:59:32 +02:00
Alexandre SPANGARO	c9a36cede6	Update work	2019-06-26 11:13:34 +02:00
Alexandre SPANGARO	a6a0e2bc77	NEW: Accountancy - Add hook bookkeepinglist on general ledger	2019-06-26 10:58:36 +02:00
Laurent Destailleur	229dd4d3f5	Merge branch 'develop' into 10.0_accounting6	2019-06-24 19:59:11 +02:00
Laurent Destailleur	57140b79dc	Restore official text of licence	2019-06-24 18:30:07 +02:00
Philippe GRAND	2e86344d9a	all http addresses should be https now	2019-06-24 09:38:26 +02:00
Philippe GRAND	b731edef16	all http addresses should be https now	2019-06-24 09:37:05 +02:00
Philippe GRAND	40b09f1cf7	all http addresses should be https now	2019-06-24 09:35:41 +02:00
Philippe GRAND	4d3107c57b	all http addresses should be https now	2019-06-23 15:43:32 +02:00
Philippe GRAND	d0a14d5aa7	all http addresses should be https now	2019-06-23 15:41:10 +02:00
Philippe GRAND	fea969dc63	all http addresses should be https now	2019-06-23 15:39:25 +02:00
Laurent Destailleur	d47cf87c00	Look and feel v10	2019-06-20 17:59:28 +02:00
Laurent Destailleur	6b5d477476	Fix search criteria lost after a delete	2019-06-20 17:14:04 +02:00
Laurent Destailleur	c521b9b8f8	Fix dispatch in ledger table of withdraw / direct debit payment	2019-06-20 16:58:51 +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	bff6260983	Fix syntax error	2019-06-20 12:34:29 +02:00
Laurent Destailleur	1a6dc83d4c	Fix: default accounting account for eec and export sales were not used.	2019-06-20 12:25:58 +02:00
Laurent Destailleur	898d766489	Merge pull request #11354 from rycks/allowZeroAsAccountNumber ... Allow zero as account number	2019-06-20 03:09:37 +02:00
Alexandre SPANGARO	e44b9113b7	Nowrap on amount	2019-06-19 09:01:57 +02:00
Alexandre SPANGARO	ec7523d3d2	Nowrap on amount	2019-06-19 09:01:37 +02:00
Alexandre SPANGARO	b8311da262	Nowrap on amount	2019-06-19 08:56:45 +02:00
Eric Seigne	80d4d8754d	allow zero as accountancy code nomber (replace all empty tests by != '')	2019-06-17 18:28:11 +02:00
Laurent Destailleur	f00c9a10db	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php	2019-06-13 12:15:51 +02:00
Laurent Destailleur	d4aa0bfa94	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-06-12 15:42:58 +02:00
Laurent Destailleur	47610d0323	Look and feel v10	2019-06-12 15:42:48 +02:00
Laurent Destailleur	c0949e3cf9	Merge pull request #11175 from aspangaro/10.0_Differentiated_export ... NEW Accountancy - Differentiated export	2019-06-12 15:42:20 +02:00
Laurent Destailleur	a7e0589071	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-12 13:59:22 +02:00
Laurent Destailleur	44f383c8b9	Fix data lost when creation in error	2019-06-12 13:57:34 +02:00
Laurent Destailleur	f41606ba15	Merge branch '10.0' into 10.0_Differentiated_export	2019-06-12 13:27:49 +02:00
Laurent Destailleur	9fa6674e3f	Update list.php	2019-06-12 13:03:54 +02:00
Laurent Destailleur	1e87635e8e	Update sellsjournal.php	2019-06-12 13:02:59 +02:00
Laurent Destailleur	eefd30fe1c	Update purchasesjournal.php	2019-06-12 13:01:04 +02:00
Laurent Destailleur	42915d86ec	Update expensereportsjournal.php	2019-06-12 12:57:02 +02:00
Laurent Destailleur	a400183bf1	Update bankjournal.php	2019-06-12 12:52:51 +02:00
Laurent Destailleur	f435f4bd6a	Update bankjournal.php	2019-06-12 12:49:44 +02:00
Laurent Destailleur	402cbba4ad	Update bankjournal.php	2019-06-12 12:48:21 +02:00
Laurent Destailleur	3aacd45437	Update list.php	2019-06-12 12:47:35 +02:00
Laurent Destailleur	1182c0d1f5	Update list.php	2019-06-12 12:46:44 +02:00
Laurent Destailleur	0f3db439fe	Update bankjournal.php	2019-06-12 12:38:01 +02:00
Alexandre SPANGARO	b079a8ba64	Minwidth100 on amount	2019-06-11 05:03:48 +02:00
Alexandre SPANGARO	a96b10db62	Fix label country on bind list	2019-06-11 05:00:47 +02:00
Alexandre SPANGARO	f3cba86282	Better look	2019-06-10 07:49:10 +02:00
florian HENRY	21f6daae2a	fix scrunitizer	2019-06-05 17:38:10 +02:00
Laurent Destailleur	ba2b07917b	Fix look and feel v10	2019-06-04 02:11:03 +02:00
Laurent Destailleur	cb859b7dfb	Look and feel v10	2019-06-04 01:30:17 +02:00
Laurent Destailleur	29d9983669	Fix look and feel v10	2019-06-04 01:22:26 +02:00
Laurent Destailleur	69efc54fb6	Merge pull request #11263 from atm-arnaud/9.0_FIX_productaccount_buy_page ... FIX productaccount buylist with pages	2019-05-29 13:52:53 +02:00
Laurent Destailleur	b6f4cab20d	Merge pull request #11247 from aspangaro/develop ... Accountancy - Use Ansi on Agiris model export & indent	2019-05-29 12:23:25 +02:00
Laurent Destailleur	fd0eb47b35	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/card.php	2019-05-29 09:57:48 +02:00
Laurent Destailleur	35b021f203	Fix phpcs	2019-05-29 09:53:54 +02:00
atm-arnaud	a853764f6d	FIX productaccount buylist with pages	2019-05-28 15:03:36 +02:00
Alexandre SPANGARO	4be46d35b0	Merge remote-tracking branch 'upstream/develop' into develop	2019-05-26 14:07:23 +02:00
Laurent Destailleur	19ff0120ff	# WARNING: head commit changed in the meantime ... Removed uselesss files (replaced by DebugBar)	2019-05-26 11:42:00 +02:00
Alexandre SPANGARO	09faf3aa5b	Accountancy - Use Ansi on Agiris model export & indent	2019-05-24 21:48:36 +02:00
Laurent Destailleur	bad565cc64	Fix syntax error	2019-05-24 18:13:24 +02:00
Laurent Destailleur	0fc7ad7c1f	Add one param to fetch of accounting account to solve chart import	2019-05-24 18:05:29 +02:00
Laurent Destailleur	769fbdb429	FIX the id was not loaded in fetch of accounting system	2019-05-24 17:39:37 +02:00
Alexandre SPANGARO	34a91ef96f	Apply button reexport on view list	2019-05-23 11:21:41 +02:00
Alexandre SPANGARO	2085958a69	Merge branch 'develop' into 10.0_Differentiated_export	2019-05-23 11:10:07 +02:00
Alexandre SPANGARO	4ba8cf0641	Fix	2019-05-23 11:08:06 +02:00
Alexandre SPANGARO	d4384f507d	WIP	2019-05-23 09:25:09 +02:00
Alexandre SPANGARO	65070afce4	WIP	2019-05-22 17:22:49 +02:00
Alexandre SPANGARO	a182b89bb0	Merge branch 'develop' into 10.0_closure2	2019-05-22 13:52:13 +02:00
a-schild	fff133b8a5	PSR_2 Format of code	2019-05-22 11:40:58 +02:00
a-schild	a823882f76	Some more formatting fixes	2019-05-22 10:57:59 +02:00
a-schild	5f25398c5c	Corrected code format and documentation	2019-05-22 10:34:39 +02:00
a-schild	d54c1aca01	Add accountancy export option for Sage50 Swiss	2019-05-22 10:01:25 +02:00
Laurent Destailleur	1e85444e18	Merge pull request #11222 from aspangaro/10.0_openconcerto ... Fix Accountancy Export OpenConcerto	2019-05-21 22:41:25 +02:00
Laurent Destailleur	e463b17c15	Fix look and feel v10	2019-05-21 15:31:56 +02:00
Alexandre SPANGARO	d9e9cb2ea9	Merge branch 'develop' into 10.0_Differentiated_export	2019-05-20 15:02:05 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Alexandre SPANGARO	5a05cc184b	Fix Accountancy Export OpenConcerto	2019-05-19 10:48:43 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button ... NEW : look and feel title button	2019-05-18 16:04:47 +02:00
Laurent Destailleur	bd1ed4f7ac	Merge branch 'develop' into 10.0_Differentiated_export	2019-05-16 21:26:20 +02:00
Alexandre SPANGARO	f123f9951f	NEW Add OpenConcerto export format	2019-05-15 12:16:03 +02:00
Alexandre SPANGARO	7c9ccee64d	NEW Accountancy - Differentiated export	2019-05-14 05:45:36 +02:00
Alexandre SPANGARO	d4e2fab983	Replace term "Advanced accountancy" by Accountancy (Double entries)	2019-05-13 22:25:15 +02:00
John BOTELLA	b0e780fab0	Fix travis	2019-05-13 09:39:45 +02:00
John BOTELLA	f296093f8d	fix travis	2019-05-10 15:52:46 +02:00
Laurent Destailleur	bb4cda6719	Fix phpcs	2019-05-08 19:08:40 +02:00
Laurent Destailleur	590b1d1e90	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php	2019-05-08 18:24:50 +02:00
Laurent Destailleur	e37519ed89	Fix label	2019-05-07 22:43:59 +02:00
Alexandre SPANGARO	b30929af6d	WIP	2019-05-06 11:05:00 +02:00
Alexandre SPANGARO	4baffae297	Merge remote-tracking branch 'upstream/develop' into 10.0_closure2	2019-05-05 22:43:02 +02:00
Alexandre SPANGARO	99b068b625	FIX sortfield on lettering function	2019-05-05 21:46:56 +02:00
Alexandre SPANGARO	4e16992796	WIP	2019-05-05 14:07:42 +02:00
Laurent Destailleur	204fc329a6	Merge pull request #11121 from frederic34/patch-2 ... Update thirdparty_lettering_customer.php	2019-05-04 12:46:35 +02:00
Laurent Destailleur	60bf3452c3	Hide export in EEC for non european countries	2019-05-04 12:26:54 +02:00
Frédéric FRANCE	0c5d9de13f	Update thirdparty_lettering_supplier.php	2019-05-04 10:38:49 +02:00
Frédéric FRANCE	c595a591a2	Update thirdparty_lettering_customer.php	2019-05-04 10:37:29 +02:00
Frédéric FRANCE	fc520810b7	Update thirdparty_lettering_customer.php	2019-05-04 10:17:04 +02:00
Frédéric FRANCE	4e9b9b61d8	Update thirdparty_lettering_supplier.php	2019-05-04 10:16:27 +02:00
Frédéric FRANCE	4b8083832c	Update thirdparty_lettering_customer.php	2019-05-04 10:13:44 +02:00
Alexandre SPANGARO	be1eb7829e	Merge remote-tracking branch 'upstream/develop' into 10.0_closure2	2019-05-04 07:41:23 +02:00
Alexandre SPANGARO	0359b1820a	Merge remote-tracking branch 'upstream/develop' into develop	2019-05-03 14:10:57 +02:00
Alexandre SPANGARO	61547e3f82	NEW Manage account sell_intra & sell_export in page default product	2019-05-03 14:08:20 +02:00
Laurent Destailleur	dd4e70efe7	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/accountancy/class/lettering.class.php	2019-05-03 12:14:17 +02:00
Laurent Destailleur	6797c95164	Fix syntax error	2019-05-03 12:10:29 +02:00
Alexandre SPANGARO	7bd99c0eee	fix	2019-05-02 14:08:28 +02:00
Alexandre SPANGARO	cbe23741eb	FIX Massive debug in lettering function	2019-05-02 14:06:55 +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	6f9e71dae3	Merge remote-tracking branch 'upstream/develop' into 10.0_closure2	2019-04-24 21:15:54 +02:00
Laurent Destailleur	4421dedbd2	Merge pull request #11008 from aspangaro/10.0_closure ... FIX: Update blocked by datec on fiscal year	2019-04-24 10:28:23 +02:00
Laurent Destailleur	74d0edfc59	Removed not used file	2019-04-23 13:24:32 +02:00
Laurent Destailleur	a8b645c7a3	Fix warnings	2019-04-23 13:07:46 +02:00
Laurent Destailleur	7c458ee4c0	TODO	2019-04-23 13:02:25 +02:00
Laurent Destailleur	1c90d157a0	Look and feel v10	2019-04-19 18:45:01 +02:00
Laurent Destailleur	94ca74b37e	Merge pull request #11009 from bafbes/abb90047 ... fix:Select chart plan from active countries only 2829bfc	2019-04-19 13:12:00 +02:00
Laurent Destailleur	6d34a38042	Update account.php	2019-04-19 13:11:50 +02:00
Laurent Destailleur	cb8f9cc120	Fix link	2019-04-19 12:37:55 +02:00
Laurent Destailleur	87eb5f5c02	Fix filter lost	2019-04-19 12:36:32 +02:00
Laurent Destailleur	61428b9c00	Fix use standard product country code if country of buyer not defined	2019-04-19 12:19:45 +02:00
Laurent Destailleur	eab474e23a	Update list.php	2019-04-19 12:10:40 +02:00
Laurent Destailleur	265671a5f3	Update list.php	2019-04-19 12:00:06 +02:00
Alexandre SPANGARO	033e9b9f22	FIX Accounting Customer dispatch with intra/export	2019-04-19 06:48:51 +02:00
Alexandre SPANGARO	660a1cea1d	NEW Accounting - Add rights on export, delete operations in ledger	2019-04-17 07:26:39 +02:00
ATM john	07e6ce5460	Appli function to links	2019-04-15 21:33:31 +02:00
Alexandre SPANGARO	9957b8aed5	WIP - FEC - Validate	2019-04-15 09:07:36 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Abbes Bahfir	2829bfc84f	fix:Select chart plan from active countries only	2019-04-14 17:36:16 +01:00
Alexandre SPANGARO	c1ecfae6f2	FIX: Update on fiscal year	2019-04-13 22:46:40 +02:00
Laurent Destailleur	b8d3110266	Merge pull request #10916 from frederic34/patch-2 ... Update EBP export	2019-04-11 16:56:16 +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	321ffb859b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/projet/activity/perday.php htdocs/projet/activity/perweek.php	2019-04-08 14:09:18 +02:00
Alexandre SPANGARO	ba34b601b3	FIX: MultiEntity in lettering functionality	2019-04-04 16:44:36 +02:00
Alexandre SPANGARO	6f1b496373	Merge remote-tracking branch 'upstream/develop' into 10.0_WARNING	2019-03-28 11:57:59 +01:00
Laurent Destailleur	c62d147c60	Auto clean search field to avoid to have 2 conflict search criteria	2019-03-25 16:47:20 +01:00
Frédéric FRANCE	f9c1289a5b	Update EBP export ... @aspangaro @Darkjeff can you confirm that montant must be always >0 (in case of credit)	2019-03-25 14:52:30 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Philippe GRAND	5677177ebc	update with html5 compliant code	2019-03-19 13:45:50 +01:00
Philippe GRAND	d118d269a2	update with html5 compliant code	2019-03-19 13:44:21 +01:00
Laurent Destailleur	eab11ce743	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2019-03-19 13:14:44 +01:00
Laurent Destailleur	dbe15d3685	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-19 13:10:17 +01:00
Laurent Destailleur	8664594fc8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:39 +01:00
Philippe Grand	2a91629e57	Update accountingaccount.class.php	2019-03-18 12:24:52 +01:00
Philippe GRAND	c98f3ae4b3	add comments	2019-03-18 10:20:24 +01:00
Laurent Destailleur	ae35c982af	Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit ... FIX : need to round with 2 decimals to avoid movements not correctly balanced	2019-03-16 14:27:03 +01:00
Frédéric FRANCE	4822a2d396	Update accountancycategory.class.php	2019-03-16 09:51:57 +01:00
Laurent Destailleur	63b6900f2c	Fix phpcs	2019-03-15 16:09:20 +01:00
Laurent Destailleur	d4f2a16abf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php	2019-03-14 17:10:58 +01:00
Laurent Destailleur	a0d8ba268e	Update doc with the new menu entries	2019-03-14 16:28:32 +01:00
Laurent Destailleur	8410d59182	FIX Missing field "In sale" in list	2019-03-14 16:16:50 +01:00
Laurent Destailleur	5ccfba1210	FIX Edit of personalized groups ... Conflicts: htdocs/accountancy/admin/categories.php	2019-03-14 16:06:20 +01:00
Laurent Destailleur	3ab5c3e6ab	FIX Edit of personalized groups	2019-03-14 16:03:37 +01:00
Laurent Destailleur	39e6e71b0d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php	2019-03-14 14:20:34 +01:00
Laurent Destailleur	3073567763	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-14 14:17:52 +01:00
Frédéric FRANCE	9b61577bf7	Update card.php ... It seems like GETPOST('fk_doc', 'int') of type string or string[] is incompatible with the declared type integer of property $fk_doc	2019-03-10 21:04:35 +01:00
Alexandre SPANGARO	49f72b6a9a	Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT	2019-03-09 05:50:16 +01:00
Alexandre SPANGARO	895367060c	Fix some small error	2019-03-09 05:31:05 +01:00
Alexandre SPANGARO	d926657534	FIX: Accountancy - Format EBP import ... Add doc	2019-03-08 10:57:14 +01:00
Frédéric FRANCE	a836c75d70	replace html by html5 in accountancy	2019-03-03 10:31:46 +01:00
Laurent Destailleur	a5711a51ab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/lib/json.lib.php test/phpunit/JsonLibTest.php	2019-03-02 18:30:17 +01:00
Frédéric FRANCE	e5e1a0b07d	The property $fk_doc was declared of type integer	2019-02-28 19:15:50 +01:00
Frédéric FRANCE	089875b8a2	add visibility	2019-02-27 17:53:52 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Laurent Destailleur	b33b3698c8	Merge pull request #10691 from aspangaro/develop ... NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX	2019-02-27 02:18:20 +01:00
Laurent Destailleur	7618a7348f	Merge branch 'develop' into 10.0_accountancy2	2019-02-27 01:51:01 +01:00
Alexandre SPANGARO	1c59554806	NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX	2019-02-25 22:22:31 +01:00
Frédéric FRANCE	42a1387218	wip	2019-02-25 00:56:48 +01:00
Laurent Destailleur	6b46a927f1	Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket	2019-02-24 20:53:54 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
Frédéric FRANCE	70350231ca	Update accountancycategory.class.php	2019-02-23 18:49:28 +01:00
Laurent Destailleur	cdf85b0d00	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-23 16:02:35 +01:00
Laurent Destailleur	9ba6e3f8f5	FIX #10638	2019-02-23 15:57:57 +01:00
Philippe GRAND	33164bcb3e	fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator.	2019-02-21 14:25:09 +01:00
Laurent Destailleur	acc0ac2c88	Fix line feed	2019-02-20 05:05:26 +01:00
Laurent Destailleur	d5c2984266	Merge pull request #10622 from aspangaro/10.0_portal2 ... NEW: Add hooks in accountancy index	2019-02-19 13:29:46 +01:00
Alexandre SPANGARO	49a975beb3	Update works	2019-02-18 07:14:21 +01:00
Alexandre SPANGARO	93a0cdd6d6	NEW: Add accounting account for result ... Use for closure workflow	2019-02-18 06:00:21 +01:00
Alexandre SPANGARO	1b213ccbd6	NEW: Add hooks in accountancy index	2019-02-17 09:11:11 +01:00
Alexandre SPANGARO	5142d5b631	Fix also in binding page	2019-02-13 13:43:59 +01:00
Laurent Destailleur	205152501e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/public/payment/newpayment.php	2019-02-12 13:39:39 +01:00
Laurent Destailleur	00eb95b660	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-12 13:36:32 +01:00
Laurent Destailleur	53a8f1cd3b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-12 13:36:05 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
Laurent Destailleur	9dc2a1f148	Update productaccount.php	2019-02-12 12:51:52 +01:00
Laurent Destailleur	53b2100dbb	Update productaccount.php	2019-02-12 12:50:36 +01:00
Alexandre SPANGARO	2dc4edb68c	FIX: Accountancy - Add transaction with multicompany use all the time 1st entity	2019-02-11 11:36:12 +01:00
klemens	beb2791dde	spelling fixes	2019-02-10 12:59:09 +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
gauthier	2142ccee8a	FIX : better method	2019-02-08 15:17:40 +01:00
Maxime Kohlhaas	da361f0ea5	Fix wrong column name in purchase journal	2019-02-08 12:24:07 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop ... psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	afd53a99c2	Fix merge	2019-02-03 18:21:03 +01:00
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +01:00
Laurent Destailleur	456e78b7cf	FIX #10485	2019-02-03 17:45:31 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Philippe GRAND	a0e87fbfd2	update with html5 compliant code	2019-01-30 19:38:04 +01:00
Philippe GRAND	e12f66e3d9	update with html5 compliant code	2019-01-30 19:34:33 +01:00
Philippe GRAND	06055ed586	update with html5 compliant code	2019-01-30 19:32:08 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	d0b20178e0	Merge pull request #10442 from aspangaro/10.0_accountancy_default ... NEW: When you create product or service, sell accountancy account by default are proposed	2019-01-30 16:30:13 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines ... PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	bdbc61c1aa	Merge pull request #10454 from grandoc/new_branch_30_01_2019 ... update with html5 compliant code	2019-01-30 16:01:08 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Philippe GRAND	1eb57b6542	update with html5 compliant code	2019-01-30 09:32:19 +01:00
Philippe GRAND	cda89c65cd	update with html5 compliant code	2019-01-30 09:30:55 +01:00
Philippe GRAND	cf27065ed1	update with html5 compliant code	2019-01-30 09:24:22 +01:00
Philippe GRAND	bb6159784a	update with html5 compliant code	2019-01-30 08:42:31 +01:00
Alexandre SPANGARO	64975b3b9e	NEW: When you create product or service, sell accountancy account by default are proposed	2019-01-28 22:27:55 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	ff39491f15	wip	2019-01-27 23:31:37 +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	12e75cb8c9	Merge pull request #10401 from aspangaro/10.0_accountancy2 ... NEW: Automatically binding for intra/export accountancy code in customer list	2019-01-27 18:06:08 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	999f84458f	Merge pull request #10415 from grandoc/new_branch_25_01_2019 ... fix : The condition == 3 is always false	2019-01-26 14:01:35 +01:00
Laurent Destailleur	d3decebd83	Merge pull request #10418 from grandoc/new_branch_26_01_2019 ... fix : bad type cast	2019-01-26 14:00:59 +01:00
Laurent Destailleur	a10203bfad	Merge pull request #10378 from rycks/exportJournaux ... Export journaux	2019-01-26 13:51:41 +01:00
Philippe Grand	a1b90638d4	Update card.php ... fix	2019-01-26 09:10:16 +01:00
Philippe GRAND	b1ea5af876	fix : bad type cast	2019-01-26 09:02:49 +01:00
Philippe GRAND	133e6f3de0	useless code	2019-01-25 16:27:36 +01:00
Philippe GRAND	0d089f2fec	fix : The condition == 3 is always false	2019-01-25 15:50:30 +01:00
Alexandre SPANGARO	9ff848210f	NEW: Automatically binding for intra/export accountancy code	2019-01-23 22:14:13 +01:00
Philippe GRAND	1f3be71d8b	update with html5 compliant code	2019-01-21 21:22:12 +01:00
Philippe GRAND	1741e77996	update with html5 compliant code	2019-01-21 21:19:42 +01:00
Philippe GRAND	9ce73dfa71	update with html5 compliant code	2019-01-21 21:15:53 +01:00
Philippe GRAND	f045cf353b	update with html5 compliant code	2019-01-21 21:13:42 +01:00
Laurent Destailleur	b868397902	Fix colspan	2019-01-21 02:27:13 +01:00
Eric	fdb1e1145c	add if ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL	2019-01-20 20:58:52 +01:00
Eric	71f7aa9503	use transnoentitiesnoconv instead of html_entity_decode	2019-01-20 20:55:59 +01:00
Laurent Destailleur	3ddfcbe3bb	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml dev/setup/codesniffer/ruleset.xml	2019-01-20 20:36:45 +01:00
Laurent Destailleur	da2ba20653	Try fix for postgresql	2019-01-20 20:31:12 +01:00
Laurent Destailleur	f7c11ec7f4	Fix unit test on accounting	2019-01-20 17:06:24 +01:00
Eric	88efc830fe	re enable export for expensereportsjournal	2019-01-20 15:25:53 +01:00
Eric	df5aa33022	add html_entity_decode on fields for export process (for example &acute -> é)	2019-01-20 15:25:24 +01:00
Eric	13586ff3d8	typo on my previus patch MainAccountForSupplierssNotDefined -> MainAccountForSuppliersNotDefined	2019-01-20 15:24:38 +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
Laurent Destailleur	2ce8529c06	Merge pull request #10346 from grandoc/new_branch_16_01_2019 ... update with html5 compliant code	2019-01-16 19:39:31 +01:00
Philippe Grand	98ebc0a667	Update index.php	2019-01-16 19:24:15 +01:00
Philippe Grand	551a1a5e58	Update lines.php	2019-01-16 19:23:41 +01:00
Philippe Grand	3cc68aca21	Update index.php	2019-01-16 19:23:08 +01:00
Philippe Grand	13ea2d93dd	Update index.php	2019-01-16 19:22:29 +01:00
Philippe Grand	5810fa9acd	Update list.php	2019-01-16 19:21:19 +01:00
Philippe Grand	dff30f17a5	Update productaccount.php	2019-01-16 19:20:28 +01:00
Philippe Grand	c9aa00c09f	Update productaccount.php	2019-01-16 19:19:54 +01:00
Philippe Grand	6d266d78b1	Update productaccount.php	2019-01-16 19:19:14 +01:00
Philippe Grand	27edf7c803	Update importaccounts.php	2019-01-16 19:18:36 +01:00
Philippe Grand	9e699b59ad	Update fiscalyear.php	2019-01-16 19:17:53 +01:00
Philippe GRAND	3168c76946	update with html5 compliant code	2019-01-16 17:39:40 +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	05cdf895e8	Allow supplier code to be '0', but not empty ('')	2019-01-09 11:10:44 +01:00
Laurent Destailleur	86f0d6c26f	FIX Warning on non complete setup	2019-01-09 11:02:06 +01:00
Laurent Destailleur	5d0ff28556	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/societe/card.php	2019-01-08 01:56:03 +01:00
Laurent Destailleur	d2f6899346	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/admin/defaultvalues.php htdocs/societe/card.php	2019-01-08 01:53:00 +01:00
Laurent Destailleur	6e078105ab	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php	2019-01-06 01:22:10 +01:00
ldestailleur	0ce514079b	FIX Button journalize grey when mandatroy setup not done	2019-01-05 12:51:08 +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
Laurent Destailleur	c690b92410	Merge pull request #10277 from aspangaro/9.0_accountancy_html ... FIX: #10221 Html codes in accounting export	2019-01-02 19:52:18 +01:00
Laurent Destailleur	a39336c80d	Simple join is better than RIGHT JOIN	2019-01-02 19:50:23 +01:00
Alexandre SPANGARO	cbcf097ec1	FIX: #10221 Html codes in accounting export	2018-12-29 23:20:30 +01:00
Alexandre SPANGARO	3eb5b06472	FIX: Generation of FEC:CompteLib	2018-12-29 22:26:06 +01:00
Alexandre SPANGARO	41c7af590d	NEW: Accountancy - Add default accounting account for member subcriptions	2018-12-29 22:11:24 +01:00
Ferran Marcet	dc93cccbe1	FIX: Loan impossible to account	2018-12-28 12:57:04 +01:00
Laurent Destailleur	44a6644969	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-18 21:55:53 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
Alexandre SPANGARO	f728b28a67	FIX: Missing information on Agiris Export	2018-12-17 06:02:29 +01:00
Laurent Destailleur	20d24f2feb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-16 18:45:30 +01:00
Alexandre SPANGARO	6eb9013430	Fix: Accountancy - remove alert on bank account configuration when bank account is closed	2018-12-16 06:36:55 +01:00
Alexandre SPANGARO	8148ea8361	Revert "Fix: Problem with loan integration in general ledger" ... This reverts commit 50da3c2ed2.	2018-12-16 06:16:14 +01:00
Alexandre SPANGARO	50da3c2ed2	Fix: Problem with loan integration in general ledger	2018-12-16 06:14:33 +01:00
Laurent Destailleur	eb66d45947	Merge branch 'develop' into 10.0_accoutancy_stats	2018-12-15 15:17:15 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	2c5a5e5eac	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-14 16:25:48 +01:00
Laurent Destailleur	e0011222d1	Fix syntax error	2018-12-14 16:25:37 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	185524bd50	Update fiscalyear.php	2018-12-14 15:49:58 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	539e2c55cd	FIX #9629 #9625	2018-12-14 10:33:07 +01:00
Laurent Destailleur	c1ce902f91	FIX #9629 #9625	2018-12-14 10:31:09 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Alexandre SPANGARO	088c002ed1	NEW: Add stats on entries & movements by fiscal year	2018-12-02 11:01:11 +01:00
Alexandre SPANGARO	2466fa224c	Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats	2018-12-02 10:48:55 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
florian HENRY	47eda86e2f	fix scrutinizer	2018-12-01 14:39:04 +01:00
Alexandre SPANGARO	7f1a48916e	Merge remote-tracking branch 'upstream/develop' into develop	2018-12-01 07:00:34 +01:00
florian HENRY	38059ed60d	fix #10006	2018-12-01 00:39:37 +01:00
Laurent Destailleur	b15403207b	Merge pull request #10077 from aspangaro/9.0p1 ... Fix create accounting account from balance	2018-11-29 11:16:27 +01:00
Laurent Destailleur	b9e544d291	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php htdocs/resource/list.php	2018-11-26 23:08:06 +01:00
Laurent Destailleur	84d73086ea	Fix bookkeeping list was empty	2018-11-26 22:53:56 +01:00
Laurent Destailleur	4bb8568d6c	Fix doxygen	2018-11-25 12:18:45 +01:00
Alexandre SPANGARO	703d3d90eb	Revert "Fix create accounting account from balance" ... This reverts commit 9154fd366f.	2018-11-24 22:40:04 +01:00
Alexandre SPANGARO	9154fd366f	Fix create accounting account from balance	2018-11-24 22:30:06 +01:00
Frédéric FRANCE	d21abc2dc3	Update accountancycategory.class.php	2018-11-22 23:26:04 +01:00
Frédéric FRANCE	295d082da1	Update accountancycategory.class.php	2018-11-22 22:56:38 +01:00
Frédéric FRANCE	21b429836a	doc comment accountancycategory class	2018-11-22 21:08:03 +01:00
Laurent Destailleur	fe35e72e83	Fix perf. Make only one request per group for year N-1.	2018-11-22 20:45:50 +01:00
Laurent Destailleur	5727cf2910	Prepare code for performance enhancement	2018-11-22 20:09:27 +01:00
Laurent Destailleur	72fc0226e3	Optimize performance: Remove call for year N, can be done with total of ... each month	2018-11-22 19:45:35 +01:00
Laurent Destailleur	89138bc349	FIX Accounting personalized report when using multicompany	2018-11-22 10:59:39 +01:00
Laurent Destailleur	21e9c02b11	Performance enhancement in Accounting Personalized report	2018-11-22 10:40:15 +01:00
atm-quentin	4cc3fa1006	FIX we dont share object for accountancy	2018-11-16 11:23:27 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Frédéric FRANCE	4909e3afc4	doc bookkeeping class	2018-11-14 08:28:20 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email ... FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Laurent Destailleur	ed3a333436	Fix phpcs	2018-11-10 13:11:18 +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	7dd941dd51	Fix bad fix	2018-11-06 19:51:16 +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
Alexandre SPANGARO	af1305a0a8	Fix Specific finename for FEC export only available on general ledger export	2018-11-01 07:24:48 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Laurent Destailleur	0e464ea4f5	Merge pull request #9866 from frederic34/emptylines ... Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-26 15:31:24 +02:00
Frédéric FRANCE	21c441540c	add string cast	2018-10-25 21:57:19 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	612e3a9805	Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr ... into aspangaro-9.0_accountancy # Conflicts: # htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php # htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php # htdocs/accountancy/class/lettering.class.php	2018-10-24 02:54:57 +02:00
Laurent Destailleur	769bae75e9	Update list.php	2018-10-24 02:48:38 +02:00
Laurent Destailleur	a9736c1eef	Merge pull request #9828 from frederic34/patch-15 ... code comment	2018-10-24 02:44:46 +02:00
Laurent Destailleur	065d715d41	FIX #9837 - The fetchAllXXX was not managing correctly the limit	2018-10-24 02:20:07 +02:00
Laurent Destailleur	fe665a060d	Merge branch 'develop' into patch-17	2018-10-24 01:42:02 +02:00
Alexandre SPANGARO	930dce7611	change class name from lettering to Lettering	2018-10-22 06:39:23 +02:00
Alexandre SPANGARO	3f79580b19	Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy	2018-10-22 06:33:34 +02:00
Laurent Destailleur	2816bdf747	FIX Date into filename of FEC file.	2018-10-21 16:22:56 +02:00
Frédéric FRANCE	02954931d8	Update thirdparty_lettrage_supplier.php	2018-10-20 16:27:15 +02:00
Frédéric FRANCE	d3022413ef	Update thirdparty_lettrage.php	2018-10-20 16:25:57 +02:00
Frédéric FRANCE	fab10acc15	change class name from lettering to Lettering	2018-10-20 16:23:43 +02:00
Frédéric FRANCE	550dc622ca	code comment	2018-10-20 13:40:40 +02:00
Alexandre SPANGARO	a7de7013a1	Update code	2018-10-20 11:20:53 +02:00
Alexandre SPANGARO	921757c4a3	Fix travis	2018-10-20 10:57:59 +02:00
Alexandre SPANGARO	5cbcef4465	Debug Lettering	2018-10-20 08:26:30 +02:00
Alexandre SPANGARO	d3856d9289	Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy	2018-10-20 06:35:39 +02:00
Laurent Destailleur	4571210bcf	Fix remove deprecated field	2018-10-19 15:45:56 +02:00
Laurent Destailleur	5a228bf394	Merge pull request #9786 from aspangaro/9.0_accountancy2 ... Fix FEC on accountancy movement card	2018-10-19 14:33:46 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	de4ead2558	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/class/accountancycategory.class.php htdocs/core/actions_massactions.inc.php htdocs/product/reassort.php	2018-10-19 14:16:53 +02:00
Alexandre SPANGARO	a466104b81	Fix FEC on transaction card ... Fix for FEC compliance - Remove useless column label_compte - label_compte is generated with label of accounting account number - Insert also the label of the journal	2018-10-17 07:20:04 +02:00
Alexandre SPANGARO	a5ebcff2ee	Fix lettering function	2018-10-16 22:27:34 +02:00
Alexandre SPANGARO	eb4ffcf1a7	Fix FEC Missing some information in bookkeeping	2018-10-16 21:17:00 +02:00
Frédéric FRANCE	a40271e475	Update bankjournal.php	2018-10-16 20:11:32 +02:00
Frédéric FRANCE	f470068d9d	fix phpcs	2018-10-16 20:10:13 +02:00
Laurent Destailleur	ae76891853	Merge pull request #9751 from frederic34/patch-17 ... Update bookkeeping.class.php	2018-10-16 19:44:07 +02:00
Laurent Destailleur	63c79f23d6	Merge pull request #9749 from aspangaro/9.0_accountancy ... Fix FEC Missing some information on bookeeping	2018-10-16 19:35:14 +02:00
Laurent Destailleur	f0c0c4779b	Fix remove yellow alert	2018-10-16 19:32:35 +02:00
Laurent Destailleur	97429aeb7a	Merge pull request #9721 from grandoc/new_branch_10_10_2018 ... Standardize and update code	2018-10-16 19:30:19 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Philippe GRAND	bd3315528e	add links and highlight relevant text	2018-10-16 15:08:06 +02:00
Philippe GRAND	059c72c678	add links and highlight relevant text	2018-10-16 14:55:29 +02:00
Philippe GRAND	5f37e07540	add links and highlight relevant text	2018-10-16 14:42:36 +02:00
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Alexandre SPANGARO	a971a2afe6	Fix FEC	2018-10-16 06:32:55 +02:00
Alexandre SPANGARO	3a6824da68	Fix FEC Missing label_compte & label_operation	2018-10-15 21:50:05 +02:00
Alexandre SPANGARO	47305f5b0b	Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy	2018-10-15 20:06:02 +02:00
Laurent Destailleur	2684767b19	Fix pagination ... Conflicts: htdocs/accountancy/bookkeeping/balance.php	2018-10-15 11:08:40 +02:00
Laurent Destailleur	e29fb85cec	Fix limit	2018-10-15 11:07:16 +02:00
Laurent Destailleur	aa6996e2d0	Fix pagination show two times the same account on balance of accounts	2018-10-15 11:07:07 +02:00
Laurent Destailleur	9afc53ca06	Fix remove step in accountancy if module expense report not used	2018-10-15 11:05:20 +02:00
Frédéric FRANCE	425e26ecb6	Update bookkeeping.class.php	2018-10-15 08:46:41 +02:00
Frédéric FRANCE	4d6d3afbea	code comment	2018-10-15 08:39:46 +02:00
Alexandre SPANGARO	c8b9c11a01	Fix FEC Missing some subledger label on bookeeping	2018-10-15 06:53:48 +02:00
Laurent Destailleur	c881be847d	Fix remove step in accountancy if module expense report not used	2018-10-15 01:47:44 +02:00
Laurent Destailleur	35eeb32f5d	Fix pagination	2018-10-15 00:08:28 +02:00
Laurent Destailleur	b13d9650f2	Fix pagination	2018-10-15 00:06:16 +02:00
Laurent Destailleur	995f4fa35f	Fix limit	2018-10-14 23:57:07 +02:00
Laurent Destailleur	8fc73d1b1b	Fix pagination show two times the same account on balance of accounts	2018-10-14 23:47:38 +02:00
Philippe GRAND	eecc56c1a3	highlight relevant text	2018-10-14 13:00:01 +02:00
Philippe GRAND	b2677f08a4	add links for set-up	2018-10-14 12:47:26 +02:00
Philippe GRAND	5dd447445a	html5	2018-10-14 09:43:33 +02:00
Alexandre SPANGARO	d9e1312924	Debug FEC model export	2018-10-14 06:16:14 +02:00
Philippe Grand	7e82e3d44c	Update card.php	2018-10-12 19:13:07 +02:00
Philippe GRAND	18b3238bad	Standardize and update code	2018-10-12 16:56:01 +02:00
Philippe GRAND	1cfb06934c	Standardize and update code	2018-10-12 16:49:53 +02:00
Philippe GRAND	bd426d1052	Standardize and update code	2018-10-12 16:44:25 +02:00
Philippe GRAND	4df574d58e	Standardize and update code	2018-10-12 16:23:27 +02:00
Philippe GRAND	c5edb3289b	Standardize and update code	2018-10-12 16:09:05 +02:00
Philippe GRAND	181c1e0b77	Standardize and update code	2018-10-12 16:01:27 +02:00
Philippe GRAND	9d4f6dc444	Standardize and update code	2018-10-12 15:55:36 +02:00
Laurent Destailleur	cf88de05e2	NEW Add format code into exported filename	2018-10-10 20:01:01 +02:00
Laurent Destailleur	6c55bfc0f7	Fix export and remove duplicate csv export.	2018-10-10 19:45:26 +02:00
Laurent Destailleur	8d9f6aad3f	css	2018-10-10 19:20:10 +02:00
Laurent Destailleur	4a80a4d9e7	css	2018-10-10 19:18:33 +02:00
Laurent Destailleur	5cb111e339	css	2018-10-10 19:13:00 +02:00
Laurent Destailleur	9f4cee5fb7	css	2018-10-10 19:11:37 +02:00
Laurent Destailleur	b13088849b	CSS	2018-10-10 18:58:28 +02:00
Laurent Destailleur	62a6af3288	phpcs	2018-10-10 17:02:35 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	0fbc9d640e	Fix syntax error	2018-10-09 16:05:56 +02:00
Laurent Destailleur	94743d50be	Merge pull request #9707 from aspangaro/9.0_FEC ... NEW Add FEC Export in accountancy	2018-10-09 13:05:20 +02:00
Philippe GRAND	6ea115f828	Standardize code	2018-10-09 09:04:27 +02:00
Philippe GRAND	ac214a7258	Standardize code	2018-10-09 08:53:08 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	1c74dcc270	NEW Can filter on EEC, not EEC, etc... in binding step of accountancy	2018-10-09 01:47:37 +02:00
Laurent Destailleur	6ded9e843d	NEW The binding step in accountancy has a country filter like a combo	2018-10-09 01:03:46 +02:00
Alexandre SPANGARO	75b9862c14	New : Add FEC Export in accountancy	2018-10-08 21:01:21 +02:00
Philippe GRAND	dd9af92020	Standardize code	2018-10-06 12:07:24 +02:00
Philippe GRAND	da560289e3	Standardize code	2018-10-05 15:48:38 +02:00
Laurent Destailleur	20f45db6b8	Merge pull request #9677 from grandoc/new_branch_04_10_2018 ... Standardize and update code	2018-10-04 18:33:24 +02:00
Laurent Destailleur	1f44380dd1	Clean code	2018-10-04 16:20:55 +02:00
Laurent Destailleur	111d589474	NEW Can mix offset before and after with rules for due date of invoices	2018-10-04 16:06:26 +02:00
atm-ph	58d1ac427e	Fix missing hook on sellsjournal	2018-10-04 10:57:22 +02:00
Philippe GRAND	c32b96c207	Standardize and update code	2018-10-04 09:15:15 +02:00
gauthier	d6a9da57e1	FIX : need to round with 2 decimals to avoid movements not correctly balanced	2018-10-01 14:11:19 +02:00
Laurent Destailleur	85bed00474	Fix default fields	2018-09-18 11:50:04 +02:00
Laurent Destailleur	e07ce644e8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/admin.lib.php htdocs/langs/en_US/admin.lang	2018-09-18 11:49:35 +02:00
Laurent Destailleur	2d8eb034e3	FIX Maxi debug to allow to load chart of account with multicompany	2018-09-17 21:02:07 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	cc4fbfc3ef	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/commonobject.class.php	2018-09-16 12:54:39 +02:00
Frédéric FRANCE	e8d2cb6135	update code comment lettering class	2018-09-16 08:39:43 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	3bf296c9cf	Merge pull request #9448 from frederic34/loadfichetitre ... remove deprecated	2018-09-12 18:23:24 +02:00
Laurent Destailleur	b5d866f4d5	Merge pull request #9444 from frederic34/patch-11 ... Completely comment unused code	2018-09-12 18:14:22 +02:00
Laurent Destailleur	bdcbc71ce9	Merge pull request #9443 from frederic34/patch-10 ... Completely comment unused code	2018-09-12 17:28:29 +02:00
Frédéric FRANCE	d8f77f040f	Update accountancycategory.class.php	2018-09-09 23:12:16 +02:00
Frédéric FRANCE	9d8a4e463b	Update accountancycategory.class.php	2018-09-09 23:09:52 +02:00
Frédéric FRANCE	aab617aeb3	remove deprecated	2018-09-09 18:38:48 +02:00
Frédéric FRANCE	0e0db9d1ee	remove deprecated	2018-09-09 15:52:55 +02:00
Frédéric FRANCE	86e237f61f	Completely comment unused code	2018-09-09 14:18:26 +02:00
Frédéric FRANCE	fdd24a5a30	Update accountancycategory.class.php	2018-09-09 13:47:12 +02:00
Frédéric FRANCE	8c5a785797	completely comment unused code	2018-09-09 13:42:38 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	cb97a29fc0	introduce seletDate	2018-09-08 12:00:11 +02:00
Frédéric FRANCE	7e0ef3ad7e	Update fiscalyear_card.php	2018-09-06 22:10:19 +02:00
Frédéric FRANCE	3ecf788438	move phpcs:ignore	2018-09-06 18:29:01 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe GRAND	707f8b7312	fix merge	2018-09-04 14:49:56 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Frédéric FRANCE	7288335c6d	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-03 19:01:11 +02:00
Laurent Destailleur	540999faa5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/lib/company.lib.php	2018-09-03 14:06:51 +02:00
Laurent Destailleur	47655f0725	Add comment as FIXME	2018-09-03 14:00:12 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	d86d7323fb	Update code	2018-09-01 22:46:35 +02:00
Philippe GRAND	091b8269a6	fix conflict	2018-09-01 22:42:42 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Philippe Grand	df4a4aa6c9	Merge branch 'develop' into develop	2018-09-01 17:23:43 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Philippe GRAND	b59d49d3b3	Merge remote-tracking branch 'upstream/develop' into develop	2018-09-01 13:58:33 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Laurent Destailleur	aa2655d604	Merge pull request #9374 from bafbes/abb80014 ... Fix: No link is shown to access for bank transfers.	2018-09-01 13:36:08 +02:00
Frédéric FRANCE	2b5407c31d	Update export.php	2018-09-01 13:30:28 +02:00
Laurent Destailleur	0d3c34f2b3	Merge pull request #9364 from frederic34/patch-22 ... Update export.php	2018-09-01 13:29:41 +02:00
Philippe GRAND	0dc812cf10	precise label comment	2018-09-01 13:02:27 +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
Abbes Bahfir	c288c42ee3	Fix: No link is shown to access for bank transfers.	2018-08-31 18:13:56 +01:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	7973489f8a	fix display comment issue	2018-08-31 17:18:08 +02:00
Frédéric FRANCE	d8441619ed	Update export.php	2018-08-31 08:29:51 +02:00
Philippe Grand	5ec22d9fad	Update accountingaccount.class.php	2018-08-30 14:25:25 +02:00
Philippe Grand	e96e3bdf42	Update accountancycategory.class.php	2018-08-30 14:19:21 +02:00
Philippe GRAND	ba6a48360e	Standardize and update code	2018-08-30 12:26:59 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
Philippe GRAND	2e66c65650	WTF...	2018-08-30 12:03:20 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Philippe GRAND	b29721df61	Fix white spaces	2018-08-29 12:17:59 +02:00
Philippe GRAND	79988282af	Fix white spaces	2018-08-29 12:14:07 +02:00
Frédéric FRANCE	846778657f	fix syntax error	2018-08-29 11:44:26 +02:00
Philippe Grand	df05eb785b	Update accountingjournal.class.php	2018-08-28 10:38:42 +02:00
Philippe Grand	34ea3d479f	Update accountingaccount.class.php	2018-08-28 10:38:01 +02:00
Philippe Grand	c352bbbd18	Update accountancycategory.class.php	2018-08-28 10:37:16 +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
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +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	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	3309badd8d	Update accountingaccount.class.php	2018-08-22 22:43:17 +02:00
Philippe Grand	ec8422af73	Update accountingaccount.class.php	2018-08-22 22:31:54 +02:00
Philippe Grand	25b1b08d92	Update accountancysystem.class.php	2018-08-22 22:30:09 +02:00
Philippe GRAND	449ef9c464	Update and standardize code	2018-08-22 18:12:44 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +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
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	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +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
Philippe GRAND	da951e61f2	Update and standardize code	2018-08-17 22:29:21 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +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	7bb781eea8	function declaration	2018-08-15 14:28:34 +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	6113b536a0	remove superfluous spaces	2018-08-12 19:59:39 +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	f17275845d	standardize	2018-07-28 14:29:28 +02:00
Philippe GRAND	5a4524451c	standardize	2018-07-28 14:02:33 +02:00
Frédéric FRANCE	c991a4d204	trim trailing	2018-07-26 18:05:20 +02:00
Philippe GRAND	e755fde52a	clean and update code	2018-07-23 17:35:30 +02:00
Philippe GRAND	365ed9c5de	clean and update code	2018-07-23 17:28:19 +02:00
Philippe GRAND	1dd39a4c5c	clean and update code	2018-07-23 17:21:51 +02:00
Laurent Destailleur	66f9153490	Fix css	2018-07-18 11:33:53 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
Laurent Destailleur	ca04ffe420	Load lang	2018-06-22 17:07:49 +02:00
Laurent Destailleur	4f877e7970	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/lines.php htdocs/accountancy/supplier/lines.php	2018-06-18 14:46:30 +02:00
Laurent Destailleur	31067b6250	FIX picto for type in product link in accountany list is wrong	2018-06-18 14:43:32 +02:00
Laurent Destailleur	ce5514bd68	Fix sql begin at wrong place	2018-06-18 14:37:16 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
Laurent Destailleur	102f9aa84f	FIX Problems in accountancy module when using multicompany module.	2018-06-18 13:19:46 +02:00
gauthier	fed61930d5	FIX : clause must not be there	2018-06-18 11:37:15 +02:00
gauthier	e9d65ea751	FIX : need to filter on aa.entity for same accounting accounts available in several entities	2018-06-14 11:56:22 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Alexandre SPANGARO	f2c04c5653	Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)	2018-06-05 20:37:39 +02:00
Laurent Destailleur	c1f5c6becf	Merge pull request #8877 from frederic34/longlines ... soft limit length of lines to 500 chars	2018-05-30 11:19:29 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
Frédéric FRANCE	d986909109	loadlangs	2018-05-26 23:52:52 +02:00
Laurent Destailleur	182abfdb5b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/societe/card.php	2018-05-25 15:02:24 +02:00
Laurent Destailleur	02803f9284	Merge pull request #8821 from aspangaro/8.0-b26 ... Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems	2018-05-25 10:36:46 +02:00
Alexandre SPANGARO	d1e1d64b42	Add some information in bank_journal	2018-05-24 20:26:38 +02:00
Laurent Destailleur	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
Sean Wang	8e397b772f	Fix sql error	2018-05-21 14:19:41 +08:00
Alexandre SPANGARO	0b581fc507	loadLangs	2018-05-19 08:06:52 +02:00
Laurent Destailleur	004c85b4ed	Update journals_list.php	2018-05-18 11:35:37 +02:00
Laurent Destailleur	078ea2ce9b	Merge pull request #8790 from aspangaro/7.0-f1 ... Fix : Double WHERE on admin/journal_list.php	2018-05-18 11:20:05 +02:00
Laurent Destailleur	26e10caa7d	FIX #8813	2018-05-18 09:15:18 +02:00
Abbes Bahfir	933e277862	Fix: Add journal label translation in journal list	2018-05-16 19:59:56 +01:00
Alexandre SPANGARO	88bc2dd416	Correct insert	2018-05-14 20:59:38 +02:00
Alexandre SPANGARO	2f1ac6fad8	Fix : Double WHERE on admin/journal_list.php	2018-05-13 20:35:07 +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	9c68b81f59	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/admin/account.php htdocs/projet/class/task.class.php	2018-05-05 14:34:54 +02:00
florian HENRY	daf829c9f7	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/7.0.0-8.0.0.sql	2018-05-02 08:49:40 +02:00
florian HENRY	886ad9d4b6	check eldy message	2018-05-02 08:45:18 +02:00