3699 Commits

Author	SHA1	Message	Date
Laurent Destailleur	62a339e582	Minor fix in multicurrency for supplier prices	2018-03-07 14:13:46 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +01:00
Laurent Destailleur	004839b368	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-07 13:03:40 +01:00
Laurent Destailleur	8b9041b93e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-03-07 13:02:18 +01:00
Laurent Destailleur	4caefbe926	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2018-03-07 12:59:52 +01:00
Marc de Lima Lucio	dd208348c4	FIX: add planned delivery to order exports	2018-03-07 12:18:08 +01:00
ptibogxiv	afa8b37239	NEW: add link to stripe's info in bank menu	2018-03-05 19:45:55 +01:00
Laurent Destailleur	0270e21289	Merge pull request #8242 from hregis/develop_multicompany ... Fix: use "multidir_output" instead "dir_output" (propal)	2018-03-02 17:49:25 +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	8d11f1efa1	FIX Payment mode not correctly set in donation and document	2018-03-02 12:32:49 +01:00
Laurent Destailleur	a01287b211	Fix template donation	2018-03-02 12:25:43 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Regis Houssin	093ea49cc6	Fix: use "multidir_output" instead "dir_output"	2018-02-26 11:35:30 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	1f60d9ba81	Fix travis	2018-02-25 13:14:55 +01:00
Laurent Destailleur	6c16f2af1e	Merge pull request #8226 from hregis/7.0_multicompany ... Fix: differentiate sharing of "member" and "member_type"	2018-02-25 12:54:51 +01:00
Laurent Destailleur	029ef534d0	Clean deprecated code (property "special" removed from mod descriptor)	2018-02-25 10:55:02 +01:00
Laurent Destailleur	619e0d3792	FIX Bad var for substitution of free text	2018-02-24 14:03:27 +01:00
Laurent Destailleur	e2e0f23d29	FIX Bad var for substitution of free text	2018-02-24 14:01:52 +01:00
Laurent Destailleur	38d1fc27e0	Start to introduce common substitution rules for odt substitutions	2018-02-24 13:41:01 +01:00
Laurent Destailleur	c8078b54b5	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php	2018-02-24 12:52:57 +01:00
Laurent Destailleur	03d9bf1376	Restore deprecated var	2018-02-24 12:35:36 +01:00
Laurent Destailleur	cbfe241c1b	FIX Can use odx templates that does not include lines tags	2018-02-24 12:34:15 +01:00
Laurent Destailleur	daeebae647	FIX Can use odx templates that does not include lines tags	2018-02-24 12:32:48 +01:00
Regis Houssin	4c06384197	Fix: differentiate sharing of "member" and "member_type"	2018-02-24 11:13:14 +01:00
Laurent Destailleur	812911bd44	Fix type of expense report output in PDF	2018-02-23 15:33:42 +01:00
Laurent Destailleur	f002c84a76	Fix type of expense report output in PDF	2018-02-23 15:33:00 +01:00
Laurent Destailleur	0d0451e5c7	Code comment	2018-02-21 22:43:03 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	0ff148da1f	Fix import of chart account	2018-02-21 11:22:27 +01:00
Laurent Destailleur	15ba0c3b49	Close #7989 Merge manually in existing class	2018-02-20 15:35:42 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	7722f004c8	FIX #8153	2018-02-15 14:08:42 +01:00
Laurent Destailleur	f1a9f81fb4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang	2018-02-14 22:19:59 +01:00
Laurent Destailleur	7f8cbc0f62	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/adherents/type.php htdocs/contrat/services.php htdocs/contrat/tpl/linkedobjectblock.tpl.php htdocs/install/upgrade2.php	2018-02-14 22:08:18 +01:00
atm-quentin	144c13998a	NEW_einstein_pdf_modules	2018-02-13 09:51:33 +01:00
Laurent Destailleur	36ac380cac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 22:26:48 +01:00
Laurent Destailleur	a4f48fcfb6	Fix feature must be hidden (not stable)	2018-02-12 16:09:22 +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	c03ceb2205	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-12 02:56:51 +01:00
Laurent Destailleur	eb8664e649	NEW Can export leave requests	2018-02-09 16:08:28 +01:00
atm-ph	b074f580db	Fix can't update $nblignes on beforePDFCreation if we update $object->lines	2018-02-08 16:59:17 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	dde631c97b	Merge pull request #8149 from frederic34/patch-8 ... NEW Add delivery_time_days of suppliers in export profile	2018-02-08 14:09:33 +01:00
Laurent Destailleur	ab21769aa2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/facture/card.php	2018-02-08 12:58:47 +01:00
Laurent Destailleur	507328d83a	Fix syntax error	2018-02-07 17:50:16 +01:00
Laurent Destailleur	37afc58c48	The module ExpenseReport use numbering rules that you can setup (like ... other modules do). If you need to keep the hard coded numbering rule of expenses report used in 6.0, just add constant EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.	2018-02-07 17:45:13 +01:00
Laurent Destailleur	cb5d0b1677	Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE	2018-02-07 17:43:16 +01:00
Laurent Destailleur	510fc22172	Fix expense report	2018-02-07 17:01:14 +01:00
Laurent Destailleur	d8872a412b	Fix numbering for expense report	2018-02-07 15:52:57 +01:00
atm-ph	6254e20c67	Fix position if module use pdf hook "linkedobjects"	2018-02-07 15:41:39 +01:00
Frédéric FRANCE	1cff0593f8	Update modProduct.class.php	2018-02-07 10:42:21 +01:00
Frédéric FRANCE	c39f5ed26a	Update pdf_rouget.modules.php	2018-02-07 09:00:47 +01:00
Laurent Destailleur	ea92f6beae	Fix for multicompany	2018-02-06 10:57:53 +01:00
Laurent Destailleur	930d58ab96	Fix import supplier product price vat	2018-02-06 10:03:06 +01:00
Laurent Destailleur	4cfec30f93	Start to work on PDF template for timesheet	2018-02-05 15:35:55 +01:00
Laurent Destailleur	51847dfa8a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2018-02-05 15:34:50 +01:00
Laurent Destailleur	72f6b2956a	Fix: pagination into belugo template	2018-02-05 14:31:39 +01:00
Laurent Destailleur	775085e1b8	Border of comment box	2018-02-05 14:10:24 +01:00
Laurent Destailleur	13e71306ac	Start to work on payment import	2018-02-05 02:27:48 +01:00
Laurent Destailleur	8fe773204e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-04 23:18:33 +01:00
Laurent Destailleur	5455ab3280	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/projet/card.php	2018-02-04 23:17:09 +01:00
Laurent Destailleur	f3700b66c6	Fix size of columns when using PRODUCT_USE_UNIT	2018-02-04 11:17:45 +01:00
Laurent Destailleur	5c6dd0b061	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-03 19:00:04 +01:00
Laurent Destailleur	fa3f06aaaa	Merge pull request #8123 from atm-florian/7.0 ... fix warning class declaration	2018-02-03 16:33:39 +01:00
Laurent Destailleur	756f8a1b9f	Update modules_expensereport.php	2018-02-03 16:33:27 +01:00
Laurent Destailleur	97a29e87ea	Fix pdf template baleine (pb with page breaks and long task desc)	2018-02-03 16:31:36 +01:00
Laurent Destailleur	a41847d084	Fix: date of modificaiton in ledger not visible. ... Fix: show hours in date of creation in ledger. Fix: label in export. Fix: label in export of draft journal is same than on screen. Fix: missing line desc in csv export of draft bank journal.	2018-02-02 14:27:07 +01:00
florian HENRY	5d20af7751	fix warning class declaration	2018-02-01 16:15:57 +01:00
Laurent Destailleur	7f9d6a5458	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php	2018-01-31 20:25:24 +01:00
Laurent Destailleur	b49a7e245c	Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries	2018-01-31 20:22:19 +01:00
Laurent Destailleur	8d983717a3	Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user ... NEW export filter models can be share or not by user	2018-01-29 21:19:50 +01:00
Laurent Destailleur	e9441f7881	Fix name of log module to avoid confusion with blocked log	2018-01-25 17:56:46 +01:00
Laurent Destailleur	3987033aab	Fix substitution in public notes of pdf	2018-01-21 20:53:36 +01:00
atm-quentin	ce29331c05	NEW Filter export model by user	2018-01-18 12:34:22 +01:00
Laurent Destailleur	3d34a839a3	Doc	2018-01-15 17:43:18 +01:00
Laurent Destailleur	e56d74f5c4	Fix generation of doc for supplier payment	2018-01-11 19:01:47 +01:00
Laurent Destailleur	0b893c11fd	Revert "Fix wrong address used into PDF model of supplier payment" ... This reverts commit 22d92c0540.	2018-01-11 18:09:05 +01:00
Laurent Destailleur	90ddfc3f7f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/translation.php	2018-01-11 01:14:20 +01:00
Laurent Destailleur	0ae02d76a3	Merge pull request #8049 from fmarcet/6.0 ... Fix: Still using property ->client instead of ->thirdparty.	2018-01-11 01:03:47 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
Laurent Destailleur	f2b8c3c97d	Fix check of customer/supplier code	2018-01-10 18:19:54 +01:00
Ferran Marcet	d99535d9da	Fix: Still using property ->client instead of ->thirdparty.	2018-01-10 16:40:43 +01:00
atm-ph	22d92c0540	Fix wrong address used into PDF model of supplier payment	2018-01-08 15:25:18 +01:00
Laurent Destailleur	836a94fab2	Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag ... Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE	2017-12-28 07:18:57 +01:00
Laurent Destailleur	d1cfbc2906	Code comment	2017-12-22 01:03:40 +01:00
KHELIFA	d069ccdb7f	Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE ... - Fix hide payment condition for supplier proposal	2017-12-21 16:58:37 +01:00
Laurent Destailleur	2e87318b58	Fix sql error	2017-12-18 19:15:42 +01:00
Laurent Destailleur	9f2a42b67d	NEW Can filter on user on unalterable log	2017-12-16 21:50:58 +01:00
Laurent Destailleur	4abcbae79f	NEW The unalterable log can be browse by any user with he permission	2017-12-16 21:36:36 +01:00
Laurent Destailleur	394eeb3cd9	Fix rendering MD files of images by adding a css	2017-12-16 15:11:40 +01:00
Laurent Destailleur	5af153550d	Debug blockedlog: ... - Add a track into log when we disable/enable module - Add a protection to avoid disable of module when recording was started - Better compatibility with multicompany - Can filter on ref and amount - Add a permission to read the blockedlog - Add more information on payments/invoice/thirdparty into log - Reset of module data after a migration from v6 (not compatible)	2017-12-15 16:56:08 +01:00
Laurent Destailleur	9a08ee269e	Menu not visible	2017-12-14 23:43:04 +01:00
Laurent Destailleur	4a9b61047f	Filter on blockedlog	2017-12-14 17:08:43 +01:00
Laurent Destailleur	e3dcff7f5b	Fix substition for menus title and urls	2017-12-09 15:35:01 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large ... More complete template	2017-12-08 16:15:41 +01:00
alexis Algoud	62cd77d999	NEW automatic activation of external module on country set	2017-12-08 10:13:03 +01:00
Alexis Algoud	ad46bf9a94	NEW option to avoid countries to disable there blockedlog	2017-12-05 18:30:48 +01:00
alexis Algoud	a2df87ab15	NEW warning on module blocked log reset if country code is FR ... fix wrong paste click	2017-12-05 11:40:42 +01:00
Laurent Destailleur	1ce155728f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/mailings/fraise.modules.php	2017-12-01 16:25:13 +01:00
Laurent Destailleur	09e611aa21	Move status of blockedlog to experimental	2017-12-01 13:41:37 +01:00
ptibogxiv	c194538609	Update fraise.modules.php	2017-11-29 10:45:16 +01:00
ptibogxiv	883c9dbf99	Fix for multicompany ... last fix for multicompany compliance	2017-11-29 09:28:03 +01:00
Laurent Destailleur	3b98a06ebb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/mailings/fraise.modules.php	2017-11-28 12:18:01 +01:00
Laurent Destailleur	07bdd3213a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-28 12:16:13 +01:00
Laurent Destailleur	f8d6897888	Fix bug	2017-11-28 12:08:04 +01:00
ptibogxiv	10b0eafba7	Update fraise.modules.php	2017-11-27 18:12:52 +01:00
ptibogxiv	ea9071512d	Update fraise.modules.php	2017-11-27 17:08:15 +01:00
ptibogxiv	0a5a50263d	fix for multicompany	2017-11-27 16:07:40 +01:00
ptibogxiv	a9e4fcfdca	Update fraise.modules.php	2017-11-27 15:49:28 +01:00
ptibogxiv	780e8ce470	fix for multicompany	2017-11-27 15:13:14 +01:00
Laurent Destailleur	f9e99e93c3	Fux utf8 trouble on direct printing message	2017-11-27 14:34:29 +01:00
Laurent Destailleur	43c60ec224	Fix error management at wrong place	2017-11-27 13:45:59 +01:00
Laurent Destailleur	7ea96d53a2	Minor fixes	2017-11-24 18:12:01 +01:00
Laurent Destailleur	63d2d38c5f	Fix export stock with lot	2017-11-24 17:47:40 +01:00
Laurent Destailleur	8659d97e97	Fix export of lot must use properties of lot from product_lot	2017-11-24 17:44:19 +01:00
Laurent Destailleur	0370368d04	Restore lost field during merge	2017-11-24 16:46:50 +01:00
Laurent Destailleur	d7f5f14f46	Merge branch 'develop' into new_export_stock_valo	2017-11-24 16:40:36 +01:00
Laurent Destailleur	aa2397ff1d	Merge pull request #7859 from vvnt/patch-9 ... modPropale.class.php permissions in English	2017-11-24 16:34:02 +01:00
Laurent Destailleur	8bd2707678	Merge pull request #7858 from vvnt/patch-8 ... modFacture.class.php permissions in English	2017-11-24 16:33:42 +01:00
Laurent Destailleur	a18824050c	Merge pull request #7857 from vvnt/patch-7 ... modSociete.class.php permissions in English	2017-11-24 16:33:22 +01:00
Laurent Destailleur	438a68968f	Fix regression	2017-11-24 16:28:24 +01:00
Maxime Kohlhaas	cad2fedf70	New add pmp and cost price in product stock export	2017-11-23 18:41:48 +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	295b4483d4	Enhance the repair.php tool	2017-11-23 13:23:16 +01:00
vvnt	09f4abd38e	modPropale.class.php permissions in English	2017-11-22 23:22:43 +01:00
vvnt	10ba9a2fee	modFacture.class.php permissions in English	2017-11-22 23:16:15 +01:00
vvnt	1b646f755d	modSociete.class.php permissions in English	2017-11-22 23:11:36 +01:00
Laurent Destailleur	5fa8db1650	Work on timesheets	2017-11-22 21:19:40 +01:00
Laurent Destailleur	d2b3fc5813	Merge pull request #7849 from IonAgorria/resources-card ... NEW: Merge resource/add.php to resource/card.php	2017-11-22 11:33:56 +01:00
Laurent Destailleur	30d0c4f210	Merge pull request #7845 from vvnt/patch-6 ... modSociete.class.php (spelling correction)	2017-11-22 11:33:03 +01:00
Laurent Destailleur	918a51b9da	Merge pull request #7844 from vvnt/patch-5 ... modPropale.class.php (spelling correction)	2017-11-22 11:28:25 +01:00
Ion	7c6622f5b3	Merge resource/add.php to resource/card.php	2017-11-21 20:12:55 +01:00
vvnt	c74eef03dd	modSociete.class.php (spelling correction) ... Minor spelling correction.	2017-11-21 15:17:02 +01:00
vvnt	005be3f69b	modPropale.class.php (spelling correction) ... Minor spelling correction	2017-11-21 15:13:13 +01:00
vvnt	98998a7060	Update modFacture.class.php	2017-11-21 15:07:53 +01:00
Laurent Destailleur	7349b5d793	Fix php 7.2	2017-11-17 17:23:56 +01:00
Laurent Destailleur	2705030006	Code comment	2017-11-17 15:34:15 +01:00
Laurent Destailleur	2cb190fc5c	Fix return code	2017-11-17 15:27:59 +01:00
Laurent Destailleur	c527189088	Standardize page name	2017-11-16 12:18:25 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	a2c80a704f	Code comment	2017-11-13 19:06:58 +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
atm-ph	2636c2470b	Fix width of payment term is to large	2017-11-10 10:52:58 +01:00
Laurent Destailleur	45fc5701ae	NEW Add a profile to import product translations	2017-11-06 12:59:58 +01:00
Laurent Destailleur	8429de031f	Code comment	2017-11-06 11:32:02 +01:00
Laurent Destailleur	32303d30fa	Fix search on special char in module list	2017-10-31 10:46:23 +01:00
Laurent Destailleur	a40bebec40	Fix translation of module descriptions	2017-10-27 13:06:14 +02:00
Laurent Destailleur	6b65a9ac56	Fix position of resource menu	2017-10-24 09:58:32 +02:00
Laurent Destailleur	812687e10c	FIX Restore feature to enable a module during CLI upgrade	2017-10-22 16:08:52 +02:00
Laurent Destailleur	728e36f70f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php	2017-10-22 01:43:33 +02:00
Laurent Destailleur	cad44ee68a	FIX substitution in ODT of thirdparties documents	2017-10-22 01:25:59 +02:00
Laurent Destailleur	1426737a26	Work on website	2017-10-21 12:26:14 +02:00
Laurent Destailleur	3bca0ad07d	More modern picto for switch on/off ... Work on website module	2017-10-20 21:39:19 +02:00
Laurent Destailleur	0e397b3e81	Work on website module	2017-10-20 18:44:03 +02:00
Laurent Destailleur	985675d680	Clean code	2017-10-20 18:04:46 +02:00
Laurent Destailleur	6165bcdbd0	NEW Can export list of stock movements	2017-10-20 14:52:01 +02:00
Laurent Destailleur	d82af57b57	NEW Add tab "Expense report" on user card	2017-10-19 20:56:23 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. ... Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
Laurent Destailleur	1e7f726168	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-11 12:21:52 +02:00
Laurent Destailleur	99afa3a3e0	Use a shorter key for column title	2017-10-11 12:19:44 +02:00
Laurent Destailleur	f23a82b9a7	Merge pull request #7614 from dolibarr95/patch-25 ... Fix : translation error	2017-10-11 11:57:51 +02:00
Laurent Destailleur	e644f7df58	Merge pull request #7597 from hregis/develop_member ... NEW add company alias name when create company from member	2017-10-11 11:31:55 +02:00
dolibarr95	1b3f746ce0	Fix translation error ... InvoiceProForma translation is available in bills.lang	2017-10-11 11:16:01 +02:00
Laurent Destailleur	f93ecc1584	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/filefunc.inc.php htdocs/projet/activity/perweek.php htdocs/projet/element.php	2017-10-10 11:24:17 +02:00
Regis Houssin	e2206d9bf2	Fix: uniformize substitution tags	2017-10-09 16:33:22 +02:00
Maxime Kohlhaas	8513ddb9b4	Fix : missing new target type in advance target selection	2017-10-08 10:08:49 +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	f9d9642340	FIX #6981	2017-10-06 14:07:28 +02:00
Laurent Destailleur	e644d9d53f	Fix syntax code	2017-10-06 01:49:07 +02:00
Laurent Destailleur	801a5180d6	Fix scrutinizer bug reports	2017-10-06 01:16:19 +02:00
Regis Houssin	1cee16a802	Fix: minimal num, maj and special character with value 0 not work	2017-10-04 18:32:52 +02:00
Laurent Destailleur	8e0da9bfeb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/document.php	2017-10-04 13:32:53 +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	1f11dcb4bd	Fix no loose of configuration of action auto after upgrade Close #7527	2017-10-03 17:21:18 +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	0feae17ef5	Fix file not always defined	2017-09-30 11:51:34 +02:00
Laurent Destailleur	537a551bb5	Fix vat visiblity on pdf	2017-09-27 21:58:42 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
Laurent Destailleur	f1a563625b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-09-26 22:11:00 +02:00
Laurent Destailleur	6b9e754221	Merge pull request #7496 from papoteur-mga/rapports_paiements ... Rapports paiements	2017-09-26 20:02:09 +02:00
Laurent Destailleur	0dfbc8d72f	doxygen	2017-09-26 16:03:08 +02:00
Laurent Destailleur	e140878458	NEW Can import local tax rates in prices	2017-09-26 13:00:09 +02:00
Papoteur	cc9954e95e	Clean debug messages	2017-09-26 12:51:14 +02:00
Papoteur	50d639f1fa	Add total and subtotal in payments reports	2017-09-26 12:10:51 +02:00
Papoteur	cbe1683fe7	Invoice number on one line instead of two (issue#7487)	2017-09-26 11:30:28 +02:00
Papoteur	d2c55ea07b	Factorize code between payments reports client/provider	2017-09-26 11:27:53 +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	77d1a15016	Activate warning for french "Loi Finance 2016"	2017-09-19 12:03:48 +02:00
Laurent Destailleur	0355b0d9ed	Merge pull request #7414 from aspangaro/7.0-4 ... Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-18 11:16:36 +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	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	279988bd60	Remove warning	2017-09-16 12:45:54 +02:00
Laurent Destailleur	ad40d27324	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php	2017-09-16 12:22:18 +02:00
Laurent Destailleur	ff7a17eb96	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture.php	2017-09-16 12:17:30 +02:00
Laurent Destailleur	e4767b1a51	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/fiche-rec.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2017-09-16 12:11:18 +02:00
Alexandre SPANGARO	c2e1e2491d	Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-16 06:53:29 +02:00
Laurent Destailleur	bb6b3db0ac	FIX Position of signature on strato template ... Conflicts: htdocs/core/modules/contract/doc/pdf_strato.modules.php	2017-09-16 00:50:54 +02:00
Laurent Destailleur	f4de75afc3	FIX Position of signature on strato template	2017-09-16 00:49:00 +02:00
Laurent Destailleur	3c9532841f	Fix regression db => this->db	2017-09-15 19:37:23 +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	e02c220c08	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-15 11:04:27 +02:00
Laurent Destailleur	cce1549f66	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/fourn/card.php htdocs/public/members/new.php	2017-09-15 11:02:34 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	dbb50d7b16	Fix PHP 7.2	2017-09-14 11:56:43 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	e0eef2080e	FIX PDF output was sharing 2 different currencies in same total ... Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/product/doc/pdf_standard.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2017-09-13 18:13:43 +02:00
Laurent Destailleur	60078300b8	FIX PDF output was sharing 2 different currencies in same total	2017-09-13 17:57:41 +02:00
Laurent Destailleur	a4665e17d4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php	2017-09-12 13:26:25 +02:00
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
Regis Houssin	67e9b65a2e	Fix: use $array_key value instead	2017-09-09 17:07:08 +02:00
Regis Houssin	db02c32a9f	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3	2017-09-09 12:14:22 +02:00
Laurent Destailleur	8b20c5edab	FIX Remove warning when using log into syslog	2017-09-08 15:46:06 +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
Regis Houssin	d4c20a919d	Fix: avoid warning	2017-09-08 12:52:56 +02:00
Laurent Destailleur	c546243f00	Merge pull request #7328 from Dolibarr/scrutinizer-patch-1 ... Scrutinizer Auto-Fixes	2017-09-07 17:56:24 +02:00
Neil Orley	e43b13968e	New: Adds an hide hour button in the "intervention" module ... Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module	2017-09-07 15:31:19 +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	859d0dfe97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-09-06 19:24:42 +02:00
Laurent Destailleur	9cc344f8cc	Fix problem in type and customer code substitution in numbering module	2017-09-06 10:11:07 +02:00
fappels	5a75e14a8a	Add supplier qty and supplier discount for export	2017-09-05 22:50:34 +02:00
Scrutinizer Auto-Fixer	c2d32aaf18	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-09-04 10:42:51 +00:00
Laurent Destailleur	ca93be5eed	Fix priority of crons	2017-09-03 02:40:00 +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
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Laurent Destailleur	8f34de1036	NEW Can include tag {uuu} into some numbering masks to replace with user	2017-08-29 19:44:35 +02:00
Laurent Destailleur	4d908c2dd0	Merge pull request #7299 from atm-maxime/new_expense_numbering ... New : add expense report numbering mask	2017-08-29 18:24:17 +02:00
Laurent Destailleur	d96a83adac	Fix bad total included tax when mutlicurrency is on	2017-08-29 16:37:00 +02:00
Laurent Destailleur	7218a9de0e	Fix translation of total VAT	2017-08-29 13:52:24 +02:00
Laurent Destailleur	9312005318	NEW Move accountancy features into a dedicated menu	2017-08-29 12:43:47 +02:00
Laurent Destailleur	1b1ce4fdf5	Code comment	2017-08-27 19:40:43 +02:00
Laurent Destailleur	f33289ed6a	Better examples	2017-08-27 19:15:06 +02:00
Maxime Kohlhaas	350b24f32b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering	2017-08-27 17:53:19 +02:00
Maxime Kohlhaas	9eeacd8982	Fix const name	2017-08-27 10:58:01 +02:00
Maxime Kohlhaas	61fadfd0e1	New numbering module for expense report + admin setup	2017-08-27 10:49:51 +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
BENKE Charlene	831947b6d1	Little cleaning code ... $bottomlastpage is same in two case	2017-08-26 16:37:32 +02:00
Laurent Destailleur	a9e7f8b9e6	Fix trans	2017-08-25 21:27:19 +02:00
Laurent Destailleur	54cc1ac800	Merge emailing target selectors.	2017-08-25 21:20:27 +02:00
Regis Houssin	ad39c30c21	Fix: change old email	2017-08-23 21:23:18 +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	9cd5c8a564	Code comment	2017-08-22 18:34:58 +02:00
Laurent Destailleur	2104ab9aed	Disable event reminder	2017-08-21 13:11:29 +02:00
Laurent Destailleur	fe724a2e69	Fix syntax error	2017-08-21 12:35:43 +02:00
Laurent Destailleur	260beed512	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
Laurent Destailleur	4d46b2ae58	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/filefunc.inc.php	2017-08-17 22:21:30 +02:00
Laurent Destailleur	0dd5bcde40	Merge pull request #7135 from apachler/develop ... NEW Added functionality to get order customer contact as contact_xx tags	2017-08-17 18:28:23 +02:00
Laurent Destailleur	d37d1a033a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/bank/bankentries.php htdocs/core/lib/admin.lib.php htdocs/install/mysql/migration/repair.sql	2017-08-11 19:56:17 +02:00
fappels	34153eec7f	Add reading of picture paths	2017-08-07 22:36:12 +02:00
fappels	7fc359df5d	Fix pic position when VAT column hidden	2017-08-07 21:48:01 +02:00
fappels	3ef4b0fd2b	Add pictures to pdf muscadet	2017-08-07 21:47:45 +02:00
fappels	ea5dcbf611	Fix constant to show pics and remove pics column line	2017-08-07 21:35:30 +02:00
Laurent Destailleur	fd38a55f51	FIX amount overlap other amount when a pagebreak is done due to an image ... at the bottom of page.	2017-08-07 15:49:54 +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	8a71b9e95e	Avoid creation of dir that is not indexed	2017-08-04 13:51:25 +02:00
Laurent Destailleur	f058fa1938	Better detection if a module provide triggers	2017-08-03 12:19:31 +02:00
Laurent Destailleur	00a1893d93	Better help	2017-08-03 12:04:13 +02:00
Laurent Destailleur	8cd2235b4b	Start to introduce cron for email reminder.	2017-08-03 11:42:22 +02:00
Laurent Destailleur	a8e2f95c39	Better help	2017-08-03 10:47:35 +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	71d49f1c6f	Fix pb in ecm	2017-08-01 18:44:34 +02:00
Laurent Destailleur	03b3f54c2c	Fix class not found	2017-08-01 13:10:15 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
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	d8121c133e	Merge pull request #7205 from atm-quentin/6.0 ... FIX invoice situation division by zero	2017-07-31 02:23:37 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
Laurent Destailleur	46586f3055	Can export Websites pages. ... Work on export to be able to use the generic declaration of fields.	2017-07-28 14:54:13 +02:00
Laurent Destailleur	ef3c002144	Module website not stable enough	2017-07-28 12:37:52 +02:00
Laurent Destailleur	cb5b0f3352	NEW Module "Product variants" is moved as stable.	2017-07-28 11:20:01 +02:00
atm-quentin	8451ba1f14	FIX invoice situation division by zero	2017-07-26 14:43:10 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	5b9ac2a7a9	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/index.php	2017-07-25 21:11:36 +02:00
Laurent Destailleur	c386a02889	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/langs/en_US/stocks.lang	2017-07-25 21:10:08 +02:00
Laurent Destailleur	8b793a261f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/DolibarrModules.class.php	2017-07-25 21:08:31 +02:00
Laurent Destailleur	6a3add6e57	Merge pull request #7196 from hregis/6.0_bug ... Fix: translation error	2017-07-25 13:33:18 +02:00
florian HENRY	d6d454edc8	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:32:27 +02:00
Laurent Destailleur	149e1f9c67	Merge pull request #7195 from atm-florian/6.0 ... fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-25 13:31:40 +02:00
Regis Houssin	88968aae22	Fix: translation error	2017-07-24 09:10:59 +02:00
florian HENRY	b9d5f4ba10	fix : Various misspelling class (eclipse Oxygen standard PHP control)	2017-07-24 09:02:32 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Regis Houssin	2e63393bf2	Fix: wrong values if array used to force entity 0	2017-07-21 19:35:08 +02:00
Regis Houssin	48d79357a0	New: add specific translation for title of documents	2017-07-21 10:03:09 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Marc de Lima Lucio	447fdd542d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products	2017-07-18 10:30:43 +02:00
Marc de Lima Lucio	3a05b6a164	NEW add fk_unit field into product/service import/export	2017-07-18 10:20:16 +02:00
Laurent Destailleur	4fa04247a9	Finished dev	2017-07-17 11:09:32 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	e5513cff91	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/journal/bankjournal.php	2017-07-15 21:24:21 +02:00
Laurent Destailleur	4e45c7fdba	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-15 21:21:40 +02:00
Laurent Destailleur	1735a649e9	Fix permission on salary module	2017-07-15 13:02:41 +02:00
Laurent Destailleur	0763d15b4c	Debug journalization ... Debug edition of user BAN.	2017-07-15 12:37:31 +02:00
Laurent Destailleur	de66971d93	Fix bad setup	2017-07-14 15:49:33 +02:00
Regis Houssin	f745c87394	Fix: error during upgrade process	2017-07-11 21:27:51 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-11 19:10:22 +02:00
Andreas Pachler	0932ebd6c8	Added functionality to get order customer contact as contact_xx tags	2017-07-10 14:09:21 +02:00
Laurent Destailleur	d223283359	Fix phpcs	2017-07-08 20:59:53 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	cf6745b1ae	Debug module builder	2017-07-08 17:08:07 +02:00
Laurent Destailleur	bcbd2a8a91	Merge pull request #7108 from atm-ph/fix_develop_import_update ... Fix update row on xlsx import do not work as csv import	2017-07-07 20:00:28 +02:00
Laurent Destailleur	c6fc7313b1	Merge pull request #7116 from atm-ph/fix_7109 ... FIX 7109 - class name already exist for customer payment	2017-07-07 19:01:10 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
alexis Algoud	3d18c71201	FIX invoice situation VAT total rounding into PDF crabe	2017-07-05 17:21:37 +02:00
phf	31b94c1d3f	Fix 7109 - class name already exist for customer payment	2017-07-05 16:52:37 +02:00
phf	3892da7606	Fix update row on xlsx import do not work as csv import	2017-07-04 12:09:56 +02:00
Laurent Destailleur	9e26e6b0a3	Fix bad value for ref of old contracts	2017-07-03 11:42:17 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Laurent Destailleur	53708c138a	Add option to be able to debug problem of apache lock page	2017-07-01 16:52:28 +02:00
Laurent Destailleur	ea504a0516	FIX We should be able to insert data with value '0' into const	2017-06-30 11:10:05 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-29 08:51:42 +02:00
BENKE Charlene	b17937ce0d	Error fields and add date end on rapport pdf ... percentage instead percent	2017-06-28 21:29:01 +02:00
Maxime Kohlhaas	cef5c0b375	Fix column position in PDF when VAT is hidden	2017-06-28 00:38:24 +02:00
Maxime Kohlhaas	3664956b8c	Update pdf_azur.modules.php	2017-06-28 00:31:33 +02:00
Laurent Destailleur	7e6e0ee3a4	Fix link to image of MD files	2017-06-27 20:02:46 +02:00
Laurent Destailleur	08af9bf365	List before	2017-06-27 10:37:00 +02:00
Laurent Destailleur	3fdfebf7ef	Fix position of top menu does not follow 'position' field.	2017-06-27 04:25:41 +02:00
BENKE Charlene	03cb850442	$forceimgscaleheight instead $forceimgscalewidth	2017-06-24 20:48:11 +02:00
Laurent Destailleur	b0c5616ff0	Fix in the way markdown README and ChangeLog are output on module page.	2017-06-24 16:01:18 +02:00
Laurent Destailleur	81a473d547	Warning not required for the moment	2017-06-23 23:40:02 +02:00
Regis Houssin	2fffd2fa6f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 23:26:21 +02:00
Laurent Destailleur	efe5d79a86	Work on #6958. Only one type of invoice supported for supplier invoices	2017-06-20 12:58:43 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	24f7128742	Fix pb with postgresql	2017-06-19 21:04:46 +02:00
Inovea Conseil	85efe6ef74	Add import fields for societe rib ... Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice. But we must copy the translation of banks.lang in bills.lang are there an other solution ?	2017-06-19 11:32:11 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-17 12:05:33 +02:00
Laurent Destailleur	7c41c9a3e4	Fix activation of dependency for a dedicated country. ... BlockedLog depends now on CashDesk only.	2017-06-17 11:43:00 +02:00
Laurent Destailleur	1c8daf9700	Standardize and debug code of module BlockedLog	2017-06-16 12:46:15 +02:00
Laurent Destailleur	097be322a6	Modify code to match new v6 structure.	2017-06-15 19:29:00 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-14 12:16:10 +02:00
Laurent Destailleur	c088ccea32	Fix better management of export of extrafield computed.	2017-06-13 18:50:31 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
Regis Houssin	8b0354cfdf	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-06-11 16:43:31 +02:00
Laurent Destailleur	5471170a97	Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor ... NEW blockedlog hash and authority	2017-06-11 15:54:47 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Laurent Destailleur	36b18f0300	Save MAIN_VERSION_FIRST_INSTALL that is not erased.	2017-06-10 22:11:12 +02:00
atm-ph	0d24df9ffc	Fix 6939 new path for pictures is not used	2017-06-10 14:40:17 +02:00
Alexis Algoud	3d5899edf3	final blockedlog init	2017-06-10 09:25:32 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	66420d0e80	Restore lost file and better generation of modules	2017-06-02 23:02:48 +02:00
Laurent Destailleur	7ad92c3a4d	Fix new generic substitution system	2017-06-01 13:32:20 +02:00
Laurent Destailleur	77df19009d	Removed duplicated code	2017-06-01 12:11:45 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	5cb38ece19	Fix travis errors	2017-05-21 19:37:15 +02:00
Laurent Destailleur	80cbc28385	NEW Add REST API to push a file.	2017-05-20 15:52:36 +02:00
Laurent Destailleur	4e7353f8a0	Clean code	2017-05-19 13:39:00 +02:00
Laurent Destailleur	88fc7dbc3e	Fix remove warning	2017-05-18 19:24:44 +02:00
Laurent Destailleur	4a46480ef5	Fix preview of PDF contract	2017-05-18 12:40:20 +02:00
Laurent Destailleur	998254d9c6	Finish rewrite and debug of module Stripe.	2017-05-14 16:17:23 +02:00
Laurent Destailleur	57ba598b15	Merge pull request #6771 from aspangaro/6.0-stripe ... New : Module Stripe	2017-05-13 19:55:29 +02:00
Laurent Destailleur	6f9e67b1fb	Remove no more used constant	2017-05-13 13:08:25 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	cd72c50356	Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 ... Scrutinizer Auto-Fixes	2017-05-11 00:04:12 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	823e5b48e3	Code comment	2017-05-10 18:56:18 +02:00
BENKE Charlie	d570df5089	inverted value between FRST & RECUR	2017-05-10 18:17:28 +02:00
Thomas Raschbacher	70de54e97d	fix project extrafields for ODT ... for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.	2017-05-10 15:21:53 +02:00
Thomas Raschbacher	267e66abfa	Add more fields to projectcontacts substitution ... civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not	2017-05-10 08:48:28 +02:00
Laurent Destailleur	cf04e5a6e0	Fix duplicate id	2017-05-09 10:45:49 +02:00
Alexandre SPANGARO	16a41242d3	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-05-08 06:39:14 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
Scrutinizer Auto-Fixer	d93552c8c5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-05-05 17:13:29 +00:00
Laurent Destailleur	d60e98a797	No payment information on a supplier proposal by default.	2017-05-05 13:50:14 +02:00
Laurent Destailleur	68b63927e0	Maxi miscellaneous debug	2017-05-05 12:33:49 +02:00
Laurent Destailleur	768df56c07	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00
Laurent Destailleur	c196e79bf4	Merge branch 'develop' into FIX_inventory	2017-05-04 13:50:53 +02:00
Laurent Destailleur	3871da0324	Merge pull request #6729 from atm-florian/dev_importexport_ressources ... NEW : Add module resources import/export	2017-05-04 09:43:00 +02:00
alexis Algoud	12e91f1c1b	fix rights inventory only for MAIN_LEVEL_FEATURES = 2	2017-05-02 15:25:30 +02:00
alexis Algoud	6138d197e4	FIX major issues for inventory ... - Move all needed declaration from coreobject to commonobject for updateCommon, fetchCommon, deleteCommon, createCommon - Just leave method for child object into coreobject, check later if is useless - debug inventory card, PHP 7.0 compatibility - activate rights for inventory into stock module - add inventory options into stock admin module	2017-05-02 15:19:55 +02:00
Marcos García de La Fuente	7ae405a254	Corrected PHP7 warnings for several PDF document models	2017-05-02 14:08:20 +02:00
Marcos García de La Fuente	6e7fddee7d	Corrected PHP7 warnings for function pdf_einstein::write_file	2017-05-02 14:07:04 +02:00
Laurent Destailleur	92b5f8d85e	Move new feature inventory into module stock.	2017-04-29 21:53:01 +02:00
Laurent Destailleur	f5bdfc426f	Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview ... New inventory coreobject listview	2017-04-29 21:31:46 +02:00
Laurent Destailleur	a8c775dcbd	Fix compatibility with the removal of "constant".	2017-04-29 18:48:30 +02:00
Alexandre SPANGARO	586ea54bfc	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-29 07:05:02 +02:00
phf	8219ff84c8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-04-28 14:45:04 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Laurent Destailleur	10e2b128d1	Fix warning during install	2017-04-24 05:20:45 +02:00
Laurent Destailleur	65fec95458	Fix debian package	2017-04-24 04:17:59 +02:00
Alexandre SPANGARO	3b626b75c4	Update works	2017-04-22 06:58:44 +02:00
Alexandre SPANGARO	c3fe1c963a	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-22 06:33:31 +02:00
Laurent Destailleur	cfc31e91e8	FIX overwrapping of weight/volume on rouget template	2017-04-18 18:13:43 +02:00
florian HENRY	a52db08cd6	NEW : Add module resources import/export	2017-04-18 15:25:04 +02:00
Alexandre SPANGARO	d0e27f67e7	Add plugins Stripe	2017-04-18 05:44:08 +02:00
Laurent Destailleur	0994622bf8	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
Alexandre SPANGARO	fed6d71d8a	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-04-17 06:51:02 +02:00
Laurent Destailleur	e97e202deb	NEW Can import users	2017-04-17 04:22:53 +02:00
Laurent Destailleur	7354cb148a	Fix scrutinizer	2017-04-15 03:13:17 +02:00
Laurent Destailleur	8c07f514c8	Add php unit tests on expense reports	2017-04-14 16:51:30 +02:00
Laurent Destailleur	c7160ad2b9	Avoid warning	2017-04-14 14:19:21 +02:00
Laurent Destailleur	62394abb8b	Introduce skeleton for a collab module. Volunteer wanted.	2017-04-14 14:11:52 +02:00
Laurent Destailleur	e6e9b65594	NEW Reduce memory usage by removing deprecated constant loading.	2017-04-14 12:38:52 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	d49d264bec	Merge pull request #6608 from LordVan/patch-2 ... NEW Add phone numbers of project contacts as ODT vars	2017-04-01 00:30:28 +02:00
Laurent Destailleur	18e1e5b780	NEW Add "depends on" and "required by "into module informations	2017-03-30 15:54:48 +02:00
Laurent Destailleur	8e70c4a0b7	Work on 6.0 new look and feel	2017-03-30 15:39:50 +02:00
Laurent Destailleur	aca1c1944d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/data/llx_c_action_trigger.sql	2017-03-30 12:02:27 +02:00
Laurent Destailleur	141ef91dea	Fix default auto events	2017-03-30 11:53:58 +02:00
Laurent Destailleur	78cc976e9f	Work on module builder	2017-03-30 10:40:15 +02:00
Laurent Destailleur	4df8dcf980	Work on module modBlockedLog and modModuleBuilder	2017-03-29 21:50:15 +02:00
Thomas Raschbacher	a76ddc8b3f	Add phone phone numbers to project contacts ... Add phone number(s) for project contacts to be used in odt	2017-03-29 15:33:32 +02:00
phf	c3e8a5be62	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-28 17:20:50 +02:00
Laurent Destailleur	219bcb0d54	Work on 6.0 features.	2017-03-27 22:44:50 +02:00
Laurent Destailleur	8c2b70c4a7	Fix filechecker	2017-03-25 20:51:02 +01:00
atm-ph	76b95aeec0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-25 19:15:25 +01:00
atm-ph	21e30e43d9	Update entries menus	2017-03-25 19:10:16 +01:00
Laurent Destailleur	278bbf184c	Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input ... New : Add Various payment submodule linked to the accountancy to replace free input in bank	2017-03-24 22:52:39 +01:00
atm-ph	edc2d39702	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-24 17:06:40 +01:00
Laurent Destailleur	f241bfefd0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 20:20:59 +01:00
Laurent Destailleur	be0d5bee78	Fix phpcs	2017-03-23 20:07:46 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	7df9c25e60	Several fixes on multicurrency	2017-03-23 12:44:20 +01:00
Laurent Destailleur	b5e646daa0	NEW Show by default README.md file found into root dir of ext module.	2017-03-21 16:43:09 +01:00
Laurent Destailleur	a5c11dc840	NEW Add function dolMd2Html	2017-03-21 16:03:13 +01:00
Laurent Destailleur	1b0b4c9609	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-20 23:53:47 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php ... to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	ac19aba07e	FIX multicurrency management on supplier order/invoice ... Conflicts: htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php	2017-03-19 15:41:55 +01:00
Laurent Destailleur	e85206dee5	FIX multicurrency management on supplier order/invoice	2017-03-19 15:37:07 +01:00
Alexandre SPANGARO	16b12b33fc	First step : remove BANK_DISABLE_DIRECT_INPUT	2017-03-18 07:24:55 +01:00
Laurent Destailleur	35b79818b7	Uniformize css rules	2017-03-16 20:33:51 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Laurent Destailleur	d3e1a01273	Translation	2017-03-13 02:12:18 +01:00
Laurent Destailleur	520bdac510	Translation	2017-03-13 01:35:04 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	8f338a155a	Fix last_insert_id at a better place	2017-03-10 15:19:15 +01:00
Laurent Destailleur	fd3837e1d5	Merge pull request #6492 from aspangaro/6.0-donation ... NEW Add donations statistics in home statistics	2017-03-10 12:31:46 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	1d31603ad2	Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo	2017-03-10 11:46:59 +01:00
Laurent Destailleur	e44234a47f	NEW add property to show warnings when activating modules	2017-03-09 15:16:45 +01:00
Laurent Destailleur	c962daabac	NEW add property to show warnings when activating modules	2017-03-09 15:16:16 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Alexandre SPANGARO	fd0a46c5cf	New : add donations statistics in home statistics	2017-03-07 22:31:34 +01:00
Alexandre SPANGARO	6ce8aa7d6f	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-03-07 22:08:23 +01:00
Laurent Destailleur	2a1060c0fc	Merge pull request #6475 from defrance/patch-87 ... Situation total row left a col if bank enabled	2017-03-05 21:39:02 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
arnaud	cff9fa0e6b	FIX user odt	2017-03-03 12:01:58 +01:00
BENKE Charlie	83622c62be	Update pdf_crabe.modules.php	2017-03-01 21:54:30 +01:00
BENKE Charlie	a371b27564	better management of situation progress in pdf	2017-03-01 16:48:09 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Alexandre SPANGARO	05e50e1027	Merge remote-tracking branch 'uptream/develop' into 6.0-stripe	2017-02-28 05:52:43 +01:00
Laurent Destailleur	4f24613de0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/class/expensereport.class.php	2017-02-27 01:19:03 +01:00
Laurent Destailleur	92acbbd8a8	Fix parameters	2017-02-27 00:22:11 +01:00
Laurent Destailleur	63bee0c2d0	Doxygen	2017-02-24 16:23:43 +01:00
Laurent Destailleur	d0ee8c0e2d	Merge pull request #6458 from defrance/patch-83 ... inverted value between FRST & RECUR	2017-02-24 15:27:32 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
BENKE Charlie	299551f851	inverted value between FRST & RECUR	2017-02-22 15:59:10 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Alexandre SPANGARO	942b58efaf	New : Integration of Stripe	2017-02-22 06:33:52 +01:00
Laurent Destailleur	89b52e24f6	Fix menu navigation	2017-02-22 02:41:21 +01:00
Laurent Destailleur	7ab600781d	NEW Move login information on home page into a widget	2017-02-21 11:57:52 +01:00
arnaud	26b8112d4e	FIX travis check	2017-02-20 09:22:57 +01:00
arnaud	4ec664029d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment	2017-02-17 16:40:14 +01:00
arnaud	fc0abe659a	NEW PDF with numbertoword	2017-02-17 16:39:36 +01:00
Laurent Destailleur	afa5ef2913	NEW Introduce fields that can be computed during export in export ... profiles.	2017-02-17 00:19:28 +01:00
Laurent Destailleur	c3d78bf1b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/update.php	2017-02-16 22:09:37 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	f5569ee890	Add tasktime_task_duration_sec tag in odt substitution	2017-02-11 13:50:30 +01:00
Laurent Destailleur	d72e5a3646	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-10 17:34:23 +01:00
Laurent Destailleur	ca67917e80	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/modFacture.class.php	2017-02-10 17:33:32 +01:00
arnaud	4230b075c2	INIT pdf supplier payment	2017-02-10 17:28:00 +01:00
Laurent Destailleur	d463511cff	Fix: no way to know type of invoice.	2017-02-10 17:24:47 +01:00
Laurent Destailleur	5d94c8ddac	Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement ... [FIX] - Expense report on multiple page	2017-02-08 19:34:16 +01:00
Laurent Destailleur	4d16540207	Merge pull request #6393 from aspangaro/6.0-export ... NEW : [FP17] Accountancy - Add export of charts of accounts	2017-02-08 19:22:26 +01:00
De Coninck Laurent	a042c30b28	fix nex line	2017-02-08 19:00:48 +01:00
Ion	22b85b3aba	Show delay in syslog	2017-02-08 17:30:51 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr ... Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
Laurent Destailleur	4c3255857c	Fix bad syntax into criteria to filter on date in export. ... Fix missing type in export of invoices.	2017-02-08 10:45:20 +01:00
De Coninck Laurent	49e6192e62	fix the type width column and the nextY	2017-02-08 09:23:15 +01:00
Alexandre SPANGARO	e4fc52497e	New : [FP17] Accountancy - Add export of charts of accounts	2017-02-08 06:18:56 +01:00
Laurent Destailleur	2d77cb2da5	FIX #6379	2017-02-07 00:54:54 +01:00
Laurent Destailleur	8f52a34e71	Report of supplier payment is name "supplier_payments"	2017-02-06 20:37:42 +01:00
arnaud	7f6ab748c5	NEW add rapport file for supplier paiement	2017-02-03 16:42:06 +01:00
arnaud	6d3e43ddaf	NEW Report page and menu for suppliers paiements	2017-02-03 16:34:14 +01:00
Laurent Destailleur	bdca134e99	NEW Change to allow a specific numbering rule for invoice with POS ... module.	2017-02-02 23:49:17 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	5e4509953d	Associated product must be on another export profile	2017-01-29 21:25:29 +01:00
Laurent Destailleur	b4b81d8dcb	Fix css and missing translation key	2017-01-29 15:07:18 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	0c14e1d233	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-27 01:24:55 +01:00
Laurent Destailleur	8a4e957554	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-01-27 01:23:44 +01:00
Laurent Destailleur	4c28e1598b	Merge branch '5.0' into 5.0	2017-01-27 00:25:12 +01:00
Laurent Destailleur	053afe21dd	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/class/user.class.php	2017-01-26 23:40:16 +01:00
Laurent Destailleur	c1b59b1950	Fix several security bugs on expense report	2017-01-26 18:08:00 +01:00
Laurent Destailleur	c39fcce9f1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-26 10:45:38 +01:00
Laurent Destailleur	9889f0a4a2	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/modProjet.class.php htdocs/filefunc.inc.php	2017-01-26 10:44:50 +01:00
Laurent Destailleur	eac6ac0247	Fix fields into projet export	2017-01-26 10:41:02 +01:00
Ferran Marcet	0df39149c4	Fix: Hidden option not showing correctly	2017-01-25 19:28:20 +01:00
fappels	2be6011069	Fix product elephant verify for service	2017-01-23 20:59:32 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	9a5670787f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-21 12:26:50 +01:00
Laurent Destailleur	809e3ce4d5	Debug browser notification	2017-01-20 20:10:16 +01:00
Laurent Destailleur	0a4b29e1c4	Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation ... Fix pdf invoice with situation	2017-01-20 18:10:24 +01:00
Juanjo Menent	2374aa351e	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-20 15:55:51 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
gauthier	a944c82d86	FIX : $progress_width initialized	2017-01-19 09:11:06 +01:00
Laurent Destailleur	227b616ca3	Fix bad default value	2017-01-18 16:51:42 +01:00
Laurent Destailleur	ed98227303	Merge pull request #6292 from marcosgdf/remove-pdf-create-functions ... NEW Removed deprecated pdf_create functions	2017-01-18 16:48:23 +01:00
Laurent Destailleur	82492dc023	Fix oauth2 token generation for Google. The refresh token was not ... received.	2017-01-17 20:05:10 +01:00
Laurent Destailleur	16779be162	Fix missing email/multicompany field	2017-01-17 10:51:30 +01:00
Laurent Destailleur	1ded1bd52a	Fix: missing email	2017-01-17 10:34:35 +01:00
Marcos García de La Fuente	8225b06018	NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions	2017-01-16 21:59:02 +01:00
Philippe GRAND	2525a6e3a4	update code for next php versions	2017-01-16 17:24:50 +01:00
Laurent Destailleur	1b1bab94ca	More complete commit for #6114	2017-01-16 10:43:22 +01:00
Laurent Destailleur	9d72f1df62	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 01:12:11 +01:00
Laurent Destailleur	a07a77e323	Not yet ready for php 7.1	2017-01-16 01:11:38 +01:00
Laurent Destailleur	d95ac3bbdd	Fix warning	2017-01-16 00:16:20 +01:00
Laurent Destailleur	7bccaff28a	Fix remove warnings	2017-01-15 23:32:14 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Juanjo Menent	6cc3ef0c99	NEW: Events notifications in browser	2017-01-13 16:08:49 +01:00
gauthier	a90ec7a8c7	FIX : hidetop progression	2017-01-13 14:59:29 +01:00
gauthier	1886e68731	FIX : progress size	2017-01-12 17:07:22 +01:00
gauthier	307c06dfc3	FIX : pdf invoice when we use situation	2017-01-12 16:26:09 +01:00
Laurent Destailleur	9671810d13	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-12 11:33:25 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	25dcb10c1d	Merge pull request #6066 from atm-florian/dev_exportthirdparty ... NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)	2017-01-12 11:17:15 +01:00
Laurent Destailleur	7476a3c8ae	Fix error during migration	2017-01-12 10:59:27 +01:00
Alexis Algoud	8b4a43ec77	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-09 10:31:05 +01:00
Laurent Destailleur	f00f3101d9	Merge pull request #6013 from aljawaid/develop ... NEW: Make Top Menu Entries Independent Translation Strings	2017-01-07 20:45:44 +01:00
Laurent Destailleur	9cfc8d4095	Fix several problems into OAuth2 module.	2017-01-06 19:58:46 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Alexis Algoud	370be70e46	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-03 16:30:50 +01:00
Laurent Destailleur	c635baa848	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/langs/en_US/errors.lang	2017-01-03 01:34:15 +01:00
Laurent Destailleur	157b17b6d5	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/filefunc.inc.php htdocs/langs/en_US/errors.lang	2017-01-03 01:31:58 +01:00
Laurent Destailleur	b642a3a602	Prepare release 5.0	2016-12-31 16:35:56 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Marcos García de La Fuente	98599b0bbf	FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish	2016-12-27 12:56:49 +01:00
Laurent Destailleur	bbd3734a21	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/filefunc.inc.php	2016-12-26 12:42:23 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	8ce5ed0192	Fix position of discount on PDF with US letter format	2016-12-23 15:57:31 +01:00
Laurent Destailleur	9948b6d4d9	Merge pull request #6202 from GPCsolutions/supplierpaymentdateexport ... NEW: Export max payment date with supplier invoices	2016-12-23 00:50:30 +01:00
Laurent Destailleur	594ecf400b	Merge pull request #6196 from aspangaro/5.0-b12 ... Fix: Travis	2016-12-23 00:44:16 +01:00
Laurent Destailleur	77c320a092	Fix warning for expense report late	2016-12-22 15:33:43 +01:00
Raphaël Doursenaud	590fcf8399	NEW: Export max payment date with supplier invoices	2016-12-20 18:32:57 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
aspangaro	9901aaa9fe	Try to correct travis public underscore problem	2016-12-19 06:34:17 +01:00
Laurent Destailleur	9d3bd9d36f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/errors.lang	2016-12-18 11:57:04 +01:00
Laurent Destailleur	0e7da2cd22	FIX Label of project is in field title not label.	2016-12-18 11:55:30 +01:00
Laurent Destailleur	d8e394d3aa	FIX Missing field	2016-12-16 17:09:15 +01:00
Alexis Algoud	79867a85d0	fix list issue	2016-12-16 16:09:02 +01:00
Alexis Algoud	4d375bcf95	debug translate	2016-12-16 11:31:14 +01:00
Alexis Algoud	b7a6a71dff	move file to core	2016-12-15 17:20:46 +01:00
Gustavo Novaro	da7a4a9283	Replace var to public ... Improve code style	2016-12-15 10:31:46 -03:00
Alexis Algoud	703b8708e3	fix create	2016-12-15 10:39:59 +01:00
florian HENRY	a99ac7fb6b	taking account @eldy remarks	2016-12-13 16:52:49 +01:00
florian HENRY	2f138c0c37	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty	2016-12-13 16:49:39 +01:00
Maxime Kohlhaas	04ed2df827	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option ... # Conflicts: # htdocs/imports/import.php	2016-12-11 16:20:46 +01:00
Maxime Kohlhaas	4296a2802c	Wrong menu in tab link on user card	2016-12-11 14:27:10 +01:00
Maxime Kohlhaas	5ed041c0cd	Rights should not be given by default	2016-12-11 14:11:28 +01:00
florian HENRY	a797c45e3b	sdf	2016-12-09 16:28:06 +01:00
florian HENRY	101afeeb73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty	2016-12-09 16:18:36 +01:00
florian HENRY	1e39805945	integrate Eldy remarks	2016-12-09 16:14:43 +01:00
Laurent Destailleur	455a9ed4da	FIX security in import of files	2016-12-07 12:41:48 +01:00
Laurent Destailleur	db9af0118c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modAdherent.class.php	2016-12-06 14:08:43 +01:00
Laurent Destailleur	cfff6a8cb8	FIX Export of opportunity status must be code, not id.	2016-12-06 14:05:43 +01:00
Laurent Destailleur	0d7ab3301b	FIX in export. Error when using a separate extrafields.	2016-12-06 11:52:07 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
florian HENRY	c1652169f2	NEW : Add in export thirdparty for user limit on view thirpdarty to ... sales team also to subsidiaries	2016-11-30 16:09:59 +01:00
Alexis Algoud	360c952e5a	FIX column too small, header on 2 lines	2016-11-29 09:50:55 +01:00
Marcos García de La Fuente	91be05932e	Added missing modAttributes file	2016-11-27 21:50:27 +01:00
Laurent Destailleur	ce10dc618c	Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact ... FIX missing extrafields of thirdparty on contact export	2016-11-27 15:20:14 +01:00
Laurent Destailleur	a8c3ce4e55	FIX A form should not be inside a table. Create javascript troubles.	2016-11-26 12:21:50 +01:00
florian HENRY	8ea49d8887	add extrafields thirdparty on contact export	2016-11-25 10:55:09 +01:00
Laurent Destailleur	5acd09b2d5	Fix require_once instead of require.	2016-11-24 17:03:18 +01:00
Laurent Destailleur	52fac193ad	MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE does not works as it needs the add ... contact manually. Quick hack added to use the creator instead.	2016-11-23 11:50:01 +01:00
IJ	9f28795159	Add Unique Top Menu Translation ... Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text. ** Requires re-enabling module	2016-11-19 11:29:35 +00:00
Laurent Destailleur	e9b78db1ac	Several bug fixes: ... missing import_key field, ref generator parameter must be task not project, import must use css, serious database integrity problem accepting duplicate tasks.	2016-11-19 02:16:12 +01:00
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
Laurent Destailleur	d197a0e0aa	NEW Can create expense report for someone else (advanced permission) ... NEW Can clone an expense report	2016-11-13 22:01:22 +01:00
Laurent Destailleur	ee14eab802	Multi devise	2016-11-13 18:47:10 +01:00
Laurent Destailleur	0f1b34f556	Fix code unreachable	2016-11-13 18:17:49 +01:00
Laurent Destailleur	fe1c83b206	Fix code not reachable	2016-11-13 18:15:31 +01:00
Maxime Kohlhaas	edef8f883b	Add update option on product module	2016-11-13 09:40:09 +01:00
Maxime Kohlhaas	1dcecf4873	Fix select and update done check	2016-11-13 09:32:43 +01:00
Maxime Kohlhaas	5f704fe5e5	Import update, new way of working with a select	2016-11-13 09:03:34 +01:00
Maxime Kohlhaas	d18adc1231	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-11-12 09:02:35 +01:00
aspangaro	c65678d00a	Update cactus numbering model	2016-11-11 07:36:26 +01:00
aspangaro	60219fa84d	Update tulip model	2016-11-11 07:06:45 +01:00
Laurent Destailleur	52080fb917	Fix code not reachable	2016-11-08 20:06:50 +01:00
Laurent Destailleur	18d1878775	Debug accountancy module	2016-11-06 13:07:49 +01:00
Maxime Kohlhaas	e5418a7624	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-11-06 11:36:08 +01:00
BENKE Charlie	7be49e47b8	indenting and little refactoring	2016-11-01 17:09:51 +01:00
Laurent Destailleur	03b882d095	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php	2016-10-29 19:12:58 +02:00
Laurent Destailleur	17c1b3f1d2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-10-29 19:00:43 +02:00
Laurent Destailleur	78eaeab168	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-10-29 18:44:55 +02:00
Maxime Kohlhaas	be493fcf09	Fix bad parameter in hook call	2016-10-28 10:16:58 +02:00
Laurent Destailleur	27808b7f81	Merge pull request #5915 from aspangaro/5.0-p29 ... NEW Expense report documents are now available in ECM module	2016-10-26 10:57:23 +02:00
Laurent Destailleur	7d182c286c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/step1.php htdocs/projet/tasks/time.php	2016-10-26 10:40:03 +02:00
phf	3e2f39fbc0	Fix on first activate module it must create if needed the first currency rate from general settings	2016-10-25 13:31:36 +02:00
aspangaro	d0544b0aea	Merge remote-tracking branch 'Upstream/develop' into 5.0-p29	2016-10-24 05:27:49 +02:00
aspangaro	337e9db046	New: Expense report documents are now available in ECM module	2016-10-24 05:26:19 +02:00
Laurent Destailleur	ffcfe30529	FIX Avoid errors on debian	2016-10-22 16:51:54 +02:00
florian HENRY	5f3eb9097e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_resource_extrafields	2016-10-21 13:51:53 +02:00
Laurent Destailleur	c4dd689b08	Clean unreachable code	2016-10-21 11:53:41 +02:00
florian HENRY	54a154fa4f	NEW : Add ressource extrafields	2016-10-19 22:14:51 +02:00
Laurent Destailleur	28933c31dd	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/projet/card.php	2016-10-16 19:04:33 +02:00
Laurent Destailleur	2db38b4bcc	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/societe/list.php	2016-10-16 19:02:36 +02:00
Laurent Destailleur	b51b6fa8c8	Merge pull request #5865 from atm-florian/develop ... NEW : Export thirdparty with payement terms and mode	2016-10-15 02:18:07 +02:00
Laurent Destailleur	4fb66cf7a4	Better explanation for ftp module setup to avoid error with FTPS/SFTP.	2016-10-15 02:11:49 +02:00
Laurent Destailleur	78182ab504	Fix sepa mandate translation	2016-10-14 17:47:05 +02:00
florian HENRY	0b78f7f101	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2016-10-14 10:05:28 +02:00
Sergio Sanchis Climent	567f7e5365	FIX: #5340	2016-10-14 00:43:10 +02:00
Laurent Destailleur	7c1b74133a	Debug accountancy module	2016-10-13 22:29:49 +02:00
florian HENRY	4e34b6e0c6	Merge remote-tracking branch 'origin/develop' into develop	2016-10-12 19:00:32 +02:00
florian HENRY	cc28391944	NEW : Export thirdparty with payement terms and mode	2016-10-12 18:59:34 +02:00
Laurent Destailleur	ba52eb870c	Enhancement of Oauth module	2016-10-07 18:43:44 +02:00
Laurent Destailleur	03876ba637	Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right ... NEW : Reopen a paid bill is a user right	2016-10-07 13:31:10 +02:00
Laurent Destailleur	c982409c72	Fix a deadlock feature	2016-10-06 15:29:10 +02:00
Laurent Destailleur	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +02:00
Maxime Kohlhaas	c4b9692575	Missing comment	2016-10-03 09:46:31 +02:00
Maxime Kohlhaas	51d5de2e22	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-10-03 01:07:04 +02:00
Laurent Destailleur	a192045be2	FIX PHPCS	2016-10-03 00:47:11 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	51df25509e	Fix conflicts on default doc template when enabling/disabling modules	2016-10-02 20:00:57 +02:00
Maxime Kohlhaas	578cab9a70	Error management + show nb insert/update + langs	2016-10-02 19:14:28 +02:00
Laurent Destailleur	f92ca518f7	Uniformize look and feel	2016-10-02 16:38:58 +02:00
Laurent Destailleur	3efa0e411d	NEW Add a direct debit mandate PDF template.	2016-10-02 15:29:43 +02:00
Laurent Destailleur	a52ad545eb	Enhancement on module Direct Debit SEPA.	2016-10-02 13:03:45 +02:00
Laurent Destailleur	e3aa84ff5a	NEW Add last activation date as info in module list.	2016-10-02 10:41:22 +02:00
Laurent Destailleur	2668cb20cc	Work on SEPA mandate	2016-10-01 20:45:50 +02:00
Laurent Destailleur	c9792ff047	Fix translation	2016-10-01 20:12:00 +02:00
Laurent Destailleur	5a1e96b598	FIX #5823 better multicompany support for member module	2016-10-01 18:55:37 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	521008a698	FIX #5746 chrome php ... Try a fix. Not sure it solved all problems reported	2016-10-01 17:27:52 +02:00
Laurent Destailleur	d079247b2b	FIX #5813 Bug: Incoterms not being read correctly	2016-10-01 13:32:24 +02:00
Laurent Destailleur	d9ff53eb7f	Fix travis errors	2016-09-30 15:22:58 +02:00
Laurent Destailleur	287f9972a8	Merge branch 'new_no_default_rights' of ... https://github.com/atm-maxime/dolibarr into atm-maxime-new_no_default_rights Conflicts: htdocs/langs/en_US/admin.lang	2016-09-30 13:04:14 +02:00
Laurent Destailleur	94dbe3da3f	Fix the info if module are provided by module or not was wrong	2016-09-30 13:02:13 +02:00
Laurent Destailleur	b412baa880	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-29 10:49:47 +02:00
Laurent Destailleur	214dc2cba0	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-09-29 10:49:00 +02:00
Laurent Destailleur	0b49d6316e	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-09-29 10:48:14 +02:00
gauthier	03d126810c	FIX : "reopen " new right must respect advanced user rights management	2016-09-29 10:15:34 +02:00
Laurent Destailleur	4702fdc8d7	Merge pull request #5805 from simnandez/develop ... New: Add thirdparty extrafields to export thirdparty categories	2016-09-28 20:25:04 +02:00
Laurent Destailleur	e99f115a8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/tables/llx_user.sql	2016-09-28 19:49:36 +02:00
Laurent Destailleur	bfd5bb37c5	Code comment	2016-09-28 18:07:31 +02:00
Juanjo Menent	b99b97573d	New: Add thirdparty extrafields to export thirdparty categories	2016-09-28 10:53:22 +02:00
Juanjo Menent	30050b51f0	FIX: Failed to export contact categories with contact extra fields	2016-09-28 10:15:41 +02:00
gauthier	ad03bdf3b9	FIX : reopen invoice is an advanced right and default value is 1	2016-09-26 17:39:46 +02:00
aspangaro	2dbeeedd14	Move tab menu for subscription in member.lib ... Move all pages for subscription member in adherent/subscription (Card / Info / List) Rename llx_cotisation in llx_subscription Rename all db field cotisation in subscription Rename class Cotisation in class Subscription	2016-09-24 06:48:40 +02:00
gauthier	7ad2fda289	NEW : Reopen a paid bill is a user right	2016-09-22 15:06:39 +02:00
Laurent Destailleur	f1166f1898	Fix warning	2016-09-22 13:00:02 +02:00
Laurent Destailleur	d598e206cd	Fix warning	2016-09-22 12:56:48 +02:00
Laurent Destailleur	619b65e0b6	Fix warning	2016-09-22 11:06:39 +02:00
Laurent Destailleur	95f2cae825	Start to work on sepa mandate generation	2016-09-19 00:26:30 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
Laurent Destailleur	03c312e35c	Fix bad name for modules_action.php	2016-09-10 16:09:46 +02:00
Laurent Destailleur	858291c3a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-09 09:32:51 +02:00
Laurent Destailleur	0debcf745a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/cron/card.php htdocs/cron/list.php htdocs/filefunc.inc.php	2016-09-09 09:32:14 +02:00
Laurent Destailleur	417b2f566f	FIX Translation of "Name" is not a good choice for floow-up.	2016-09-08 17:31:42 +02:00
Raphaël Doursenaud	d89a877a00	Added the new familyinfo property from 4.0.0	2016-09-08 16:58:01 +02:00
Raphaël Doursenaud	f97f011cd3	Added missing properties in modules class. ... Enhanced modules class documentation.	2016-09-08 16:37:48 +02:00
Raphaël Doursenaud	4126928804	Fixed code discrepancy ... Most places and samples used editor_url so I opted for that.	2016-09-08 16:37:45 +02:00
Laurent Destailleur	5aaa3028a2	FIX Better position of fields in expense report PDF.	2016-09-07 01:47:09 +02:00
Laurent Destailleur	cc9230c07f	FIX Columns truncated and translation missing	2016-09-06 13:08:49 +02:00
Laurent Destailleur	8419202588	NEW Support free bottom text and watermark on expense report template	2016-09-06 12:47:18 +02:00
Laurent Destailleur	571aae7026	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-02 21:52:20 +02:00
Laurent Destailleur	0e4b4ee321	Merge branch 'develop-external-logging' of ... https://github.com/GPCsolutions/dolibarr into GPCsolutions-develop-external-logging Conflicts: composer.json	2016-09-02 21:51:25 +02:00
Laurent Destailleur	b01d1979f8	Merge pull request #5680 from aspangaro/5.0-p7 ... NEW: Move Expense report menu from module to menu files (Again)	2016-09-02 18:39:49 +02:00
Laurent Destailleur	e62299d67e	NEW Add date into list of print jobs for Google Print.	2016-08-31 14:36:08 +02:00
Laurent Destailleur	524dd79198	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/bank/search.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/projet/tasks/time.php	2016-08-31 00:16:07 +02:00
aspangaro	b5f093436e	NEW: Move Expense report menu from module to menu files (Again)	2016-08-30 21:43:17 +02:00
Laurent Destailleur	6ddd264178	Fix not used field	2016-08-28 17:45:20 +02:00
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
Maxime Kohlhaas	5b9acef10c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_modimport_update_option	2016-08-23 10:51:00 +02:00
Maxime Kohlhaas	e6411dd246	Start work to allow updates in import module	2016-08-22 12:25:03 +02:00
Laurent Destailleur	1fc5715040	Fix date of contract not used	2016-08-20 00:30:09 +02:00
Laurent Destailleur	69e6f6a489	Merge pull request #5608 from aspangaro/4.0-p40 ... Fix: Some problems on export with language	2016-08-17 15:54:36 +02:00
Laurent Destailleur	ba8c2dbf9f	Fix order of module for demo.	2016-08-17 11:39:11 +02:00
Laurent Destailleur	47489265b1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-08-17 11:15:30 +02:00
Raphaël Doursenaud	49cb61b530	CLOSE #5627 Allowed external logging modules. ... Removed Sentry logging.	2016-08-16 03:24:04 +02:00
Laurent Destailleur	7cc7ac5485	Fix translation	2016-08-11 17:41:09 +02:00
aspangaro	26df66f9ac	Fix: Missing language file for salaries export	2016-08-10 15:11:51 +02:00
aspangaro	4e39c41215	Fix: Typo on invoice export	2016-08-10 15:07:53 +02:00
aspangaro	cdd84244b2	Fix: Missing Language file and key for category contact export	2016-08-10 14:48:26 +02:00
aspangaro	8028b77966	Fix: MIssing language file for category members export	2016-08-10 14:39:51 +02:00
aspangaro	c442ff0d2b	Fix: Missing language file for user export when the module members is on	2016-08-10 14:29:19 +02:00
aspangaro	43ffb061ef	FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option	2016-08-10 08:07:27 +02:00
Laurent Destailleur	4d4fc87e2b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/stock/productlot_list.php htdocs/websites/index.php	2016-08-09 13:26:08 +02:00
Laurent Destailleur	2133b1c3b5	NEW Table with list of lots/serial can be viewed (module product batch).	2016-08-08 20:31:03 +02:00
Laurent Destailleur	782ab6a02b	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/modules/barcode/modules_barcode.class.php htdocs/product/admin/product.php	2016-08-05 00:42:40 +02:00
Laurent Destailleur	5126786d60	NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED	2016-08-04 15:48:34 +02:00
Laurent Destailleur	d688681605	Use standard prefix for supplier order for new install	2016-08-04 15:45:55 +02:00
florian HENRY	5144f21c6c	FIX php Strict	2016-08-02 15:36:00 +02:00
Laurent Destailleur	4a1e263e68	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-01 15:19:25 +02:00
Laurent Destailleur	b267402df6	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php	2016-08-01 15:15:32 +02:00
Laurent Destailleur	97dd1f4bbb	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2016-08-01 15:03:59 +02:00
Laurent Destailleur	803fe68061	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/compta/facture.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2016-08-01 15:01:14 +02:00
Laurent Destailleur	49258db58d	NEW Option DOC_SHOW_FIRST_SALES_REP shows name of buyer or saler on PDF.	2016-08-01 14:20:41 +02:00
Laurent Destailleur	edbd92ee3e	NEW Option SUPPLIER_ORDER_SHOW_FIRST_SALES_REP shows name of buyer on PO	2016-08-01 11:16:22 +02:00
Laurent Destailleur	0414f09e48	Fix permissions	2016-07-30 21:09:30 +02:00
Laurent Destailleur	ceb6199e87	Fix default numbering module of customer code was not enabled.	2016-07-30 12:31:32 +02:00
Laurent Destailleur	45d354ad82	Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN...	2016-07-29 22:58:39 +02:00
Laurent Destailleur	eafaa6f4dd	Fix doxygen	2016-07-29 17:30:33 +02:00
Laurent Destailleur	b85bb8c0f8	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2016-07-29 16:24:02 +02:00
Laurent Destailleur	27243069cb	FIX #5535 bad dependency. ... Conflicts: htdocs/fourn/facture/list.php	2016-07-29 15:19:04 +02:00
Sergio Sanchis Climent	2a4afb8195	FIX Notice: Trying to get property of non-object when update 3.9 -> 4.0	2016-07-29 15:13:12 +02:00
Laurent Destailleur	5d97ce038b	Fix page break when using a large html footer.	2016-07-28 23:58:13 +02:00
florian HENRY	7b72965315	FIX incoterms	2016-07-28 16:48:16 +02:00
florian HENRY	c13c15188b	FIX: incoterms do not output into crabe invoice PDF	2016-07-28 16:44:08 +02:00
Laurent Destailleur	f54946bacb	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql	2016-07-28 10:10:58 +02:00
Laurent Destailleur	889b15689b	FIX #5510	2016-07-27 19:42:09 +02:00
Laurent Destailleur	8b3136cb96	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/companies.lang	2016-07-27 19:04:55 +02:00
Laurent Destailleur	799226728d	Fix default rule for margin is choice 3: so cost price, then pmp if not ... defined, then bestu supplier price if not defined	2016-07-27 18:05:44 +02:00
Laurent Destailleur	c23fe43b62	Merge pull request #5556 from olsesacl/#5516 ... FIX #5516 PHP7 warning on supplier module's invoices configuration page	2016-07-27 11:15:21 +02:00
Laurent Destailleur	198adcf440	Merge pull request #5555 from olsesacl/#5515 ... FIX #5515 PHP7 warnings on project module's configuration page	2016-07-27 11:14:50 +02:00
Laurent Destailleur	51566970ce	Merge pull request #5554 from olsesacl/#5514 ... FIX #5514 PHP7 Warning on barcode module's configuration page	2016-07-27 11:13:49 +02:00
Maxime Kohlhaas	34b4d0225e	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option	2016-07-27 09:13:29 +02:00
Sergio Sanchis Climent	227c6906a8	FIX #5516	2016-07-26 23:26:29 +02:00
Sergio Sanchis Climent	3b57727542	PHP7 warnings on project module's configuration page	2016-07-26 22:22:55 +02:00
Sergio Sanchis Climent	c9fa12a8f9	PHP7 Warning on barcode module's configuration page	2016-07-26 22:09:06 +02:00
Sergio Sanchis Climent	7eed738fce	Fix: Accessing Direct Printing Jobs clears left menu	2016-07-26 21:53:03 +02:00
Laurent Destailleur	6d0ebbc4a3	Merge pull request #5424 from atm-florian/dev_fix5353 ... NEW #5353 IBAN and BIC should be now always mandatory for all country regarding accounting managment	2016-07-26 15:57:56 +02:00
Laurent Destailleur	a1c959e9d6	Merge pull request #5536 from defrance/patch-17 ... NEW add edition feature on action/agenda element	2016-07-26 15:29:45 +02:00
Laurent Destailleur	a3d0c01b68	Fix warning	2016-07-26 13:51:13 +02:00
florian HENRY	419dd3095b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_fix5353 Conflicts: htdocs/societe/class/societe.class.php	2016-07-26 08:59:40 +02:00
BENKE Charlie	e948002353	New : edition feature on action/agenda	2016-07-25 11:21:00 +02:00
Laurent Destailleur	af09528738	NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and ... __AMOUNT_WO_TAX__ into emails templates.	2016-07-21 20:45:30 +02:00
Laurent Destailleur	1624894346	Fix missing load	2016-07-21 19:35:45 +02:00
Laurent Destailleur	058c431483	FIX The project was lost when creating the event "sent by email". Also, ... event company "create" was not tracked by default like others.	2016-07-21 13:49:10 +02:00
Laurent Destailleur	adc9c28369	Merge pull request #5336 from atm-gauthier/develop_new_add_dorade_model ... New: Develop new add dorade model	2016-07-20 18:31:47 +02:00
Laurent Destailleur	e2a03d18dd	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-16 19:58:36 +02:00
Laurent Destailleur	553981426e	Several minor fixes in expense reports	2016-07-16 15:21:38 +02:00
Laurent Destailleur	68227d91d9	FIX after enabling module expense report, the document template is not ... active by default.	2016-07-16 14:14:28 +02:00
Laurent Destailleur	7263b29cb4	Merge pull request #5301 from atm-ph/fix_develop_issue_2858 ... NEW issue 2858 - Option to allow negative transfer	2016-07-15 18:15:20 +02:00
Laurent Destailleur	9512bf1ac7	Add phpunit tests for option USE_STRICT_CSV_RULES	2016-07-15 12:30:24 +02:00
Laurent Destailleur	f7f812e11c	Merge pull request #5269 from defrance/patch-5 ... NEW Add option to generate strict CSV. Currently if \n or \r we replaced chars, now we can addquote too	2016-07-15 11:27:02 +02:00
Laurent Destailleur	3722274029	Merge pull request #5317 from atm-gauthier/develop_add_restrictions_on_exports ... Develop add restrictions on exports	2016-07-14 20:08:59 +02:00
Laurent Destailleur	a5123c06db	Save the virtualhost so we can test without entering it each time.	2016-07-14 19:42:04 +02:00
Laurent Destailleur	490336b2e8	Fix bad dependency.	2016-07-12 20:07:53 +02:00
Laurent Destailleur	56e374ff0d	Fix remove warnings	2016-07-07 15:41:11 +02:00
florian HENRY	1bb28648c4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_fix5353 Conflicts: build/pad/DoliWamp.pml build/pad/Dolibarr.pml build/pad/pad_dolibarr.xml build/pad/pad_doliwamp.xml	2016-07-07 09:05:13 +02:00
Laurent Destailleur	061ccadd03	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/commande/list.php htdocs/fourn/commande/orderstoinvoice.php htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions htdocs/install/pgsql/functions/functions.sql	2016-07-06 15:11:29 +02:00
Laurent Destailleur	a8f06d78b1	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/install/pgsql/functions/functions.sql	2016-07-06 14:53:05 +02:00
Maxime Kohlhaas	d658e2cf31	FIX task ODT company object not correctly retrieved	2016-07-05 16:04:18 +02:00
florian HENRY	1d96f5316e	travis	2016-07-05 15:14:28 +02:00
florian HENRY	afb924043f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_fix5353 Conflicts: htdocs/core/modules/mailings/advthirdparties.modules.php	2016-07-04 20:43:14 +02:00
Maxime Kohlhaas	142aedc0cd	CSV import : listfields and listvalues are now arrays	2016-07-03 11:15:28 +02:00