dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	2cd5ed65a6	Clean deprecated (field unit_charge in supplier price)	2018-02-25 14:13:09 +01:00
Laurent Destailleur	8dceb8930f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.formactions.class.php htdocs/user/card.php	2018-02-25 12:41:17 +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	435e4823a5	Fix some warning during install	2018-02-24 11:58:09 +01:00
Laurent Destailleur	787a137509	Add column for accounting doc	2018-02-23 15:38:39 +01:00
KHELIFA	54dba24ab5	Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-02-23 11:06:07 +01:00
John	b276a8186e	Fix sql entity for sub query	2018-02-21 10:03:04 +01:00
Laurent Destailleur	87a3019e73	Fix upgrade missing steps	2018-02-20 06:03:22 +01:00
Laurent Destailleur	eb0073c330	Fix upgrade missing steps	2018-02-20 05:53:53 +01:00
Laurent Destailleur	31d0679876	Add data	2018-02-19 19:52:51 +01:00
Laurent Destailleur	1ee128ff13	NEW Add type of website container/page into dictionary	2018-02-19 19:48:53 +01:00
Marc de Lima Lucio	daca27b2ed	NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring	2018-02-14 18:02:40 +01:00
Laurent Destailleur	475b89bac1	Merge branch 'develop' into new_order_min_amount	2018-02-08 14:20:53 +01:00
Laurent Destailleur	12aec8f806	Prepare database for invoicing of projects	2018-02-02 15:19:04 +01:00
Laurent Destailleur	cebda2b141	Prepare 8.0	2018-01-28 10:57:12 +01:00
Laurent Destailleur	86e501808c	Merge pull request #7975 from dolibarr95/patch-31 Create 7.0.0-8.0.0.sql	2018-01-26 18:03:07 +01:00
Laurent Destailleur	3c3e02dbea	Fix missing fields	2018-01-21 22:47:15 +01:00
Maxime Kohlhaas	6f248a6590	New allow to define order min amount	2018-01-20 20:17:56 +01:00
Laurent Destailleur	3a8ceb130f	Fix utf8 on all fields	2018-01-19 15:17:19 +01:00
Laurent Destailleur	dcd579242f	Fix <br /> (xml) into <br> (html)	2018-01-17 13:26:57 +01:00
Laurent Destailleur	3f551f0d05	Fix migration	2018-01-17 02:19:32 +01:00
Laurent Destailleur	a84ed841cc	Fix creation date was not filled	2018-01-16 20:47:33 +01:00
Laurent Destailleur	7a88afe962	Fix field enabled and perms must differs	2018-01-13 13:16:33 +01:00
Laurent Destailleur	15ed7584b8	Fix navigation in accounting account card	2018-01-11 17:06:06 +01:00
Laurent Destailleur	9844352193	More complete repair	2018-01-08 15:04:17 +01:00
Laurent Destailleur	a37019a25b	NEW Add chart of account for england	2018-01-05 22:04:43 +01:00
Laurent Destailleur	ce680af357	Fix field name and length (database portabilit)	2017-12-28 11:16:27 +01:00
Laurent Destailleur	e6c7f9e69b	Debug module inventory	2017-12-22 21:29:09 +01:00
Laurent Destailleur	2b056b0177	BUG Fix of old hidden feature price per quantity	2017-12-22 12:53:46 +01:00
dolibarr95	a33411b8bd	Create 7.0.0-8.0.0.sql	2017-12-20 09:06:11 +01:00
Laurent Destailleur	01c99b780e	Fix missing index	2017-12-19 16:22:47 +01:00
Laurent Destailleur	98b82d712a	NEW Revenue stamp can be a percent FIX Revenue stamp not visible on the transfer payment page	2017-12-18 12:43:03 +01:00
fappels	bb700494a1	Fix Collation update missing for llx_expeditiondet_batch	2017-12-13 20:39:37 +01:00
Laurent Destailleur	066e04f33d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2017-12-11 00:22:05 +01:00
Laurent Destailleur	d701a7617b	Fix province nadorgg into nador	2017-12-10 19:04:21 +01:00
Laurent Destailleur	cf5265d405	Minor fix	2017-12-07 21:44:12 +01:00
Laurent Destailleur	dc04ab3164	Missing field in website module	2017-12-02 13:24:21 +01:00
Laurent Destailleur	6796c08cb8	Debug/rewrite Blockedlog	2017-11-30 14:21:55 +01:00
Laurent Destailleur	6a8388dd57	Add table for online signature	2017-11-25 14:11:34 +01:00
Laurent Destailleur	d90f68837a	Missing migration line	2017-11-25 00:59:25 +01:00
Laurent Destailleur	e22d13cf55	Merge pull request #7860 from IonAgorria/resources-country Add country to resource	2017-11-24 16:35:52 +01:00
Laurent Destailleur	831099fef8	Debug modulebuilder	2017-11-24 16:24:42 +01:00
Laurent Destailleur	9f235e1ff6	Standardize database: field ref of warehouse was renamed label -> ref	2017-11-24 15:27:00 +01:00
Laurent Destailleur	6a3dc91414	Standardize code	2017-11-23 15:22:32 +01:00
Laurent Destailleur	5b77fe393e	Fix: contact not preselected	2017-11-23 00:59:43 +01:00
Ion	6428c2157c	Add country to resource	2017-11-23 00:26:25 +01:00
Laurent Destailleur	cf0d67d71c	Generation of pdf become default value	2017-11-17 23:57:32 +01:00
Laurent Destailleur	d326641072	Merge pull request #7813 from hregis/develop_ldap Fix: missing encrypt datafor llx_const	2017-11-17 13:03:22 +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
Regis Houssin	a4b96f00df	Fix: missing encrypt datafor llx_const	2017-11-14 16:00:34 +01:00
Laurent Destailleur	2d78136781	Standardize field length	2017-11-13 18:04:14 +01:00
Laurent Destailleur	53bfbcf5db	NEW Ad performances indexes on calendar events	2017-11-13 17:05:07 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	cba3a3846f	Merge pull request #7790 from frederic34/facrecmodelpdf NEW generate also document when invoice is build from recurring template	2017-11-11 17:42:26 +01:00
Frédéric FRANCE	6f647f8a40	generate doc on cron jobs	2017-11-09 23:39:28 +01:00
Laurent Destailleur	f6a0603fb0	Clean code/constant	2017-11-09 18:16:15 +01:00
Laurent Destailleur	fa999dfa65	Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant NEW Accountancy Add variant on sell account for intracommunity sales & export sales	2017-11-06 09:25:14 +01:00
Laurent Destailleur	d0e354f729	Merge pull request #7766 from aspangaro/7.0-6 FIX Missing fields for the table bookeeping_tmp on migration	2017-11-05 18:38:01 +01:00
Laurent Destailleur	86eb028beb	Repair datec empty for products	2017-11-04 15:25:52 +01:00
Alexandre SPANGARO	26cb4bc6f6	FIX Missing fields for the table bookeeping_tmp on migration	2017-11-04 08:10:05 +01:00
Alexandre SPANGARO	7e3103356b	Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant # Conflicts: # htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-11-04 07:14:28 +01:00
Laurent Destailleur	4ac8cb9168	Fix sql syntax	2017-11-03 16:31:33 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01:00
Laurent Destailleur	55386a3ae2	Work on website module	2017-11-03 13:52:03 +01:00
Laurent Destailleur	fa1fbe7db7	Work on websiteaccounts	2017-11-03 13:25:49 +01:00
Alexandre SPANGARO	2d17e4094c	Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant # Conflicts: # htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-11-03 06:18:27 +01:00
Laurent Destailleur	d137cef843	Merge pull request #7707 from aspangaro/7.0-SPEC1 SPEC #7013 : use database type "double" to store monetary values	2017-11-02 09:54:34 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Alexandre SPANGARO	cc26095467	Update database	2017-10-31 22:04:50 +01:00
Alexandre SPANGARO	a0d186bae6	Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1	2017-10-31 05:53:05 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Alexandre SPANGARO	63707dbe10	Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1	2017-10-29 06:58:04 +01:00
Alexandre SPANGARO	16e4e8ada1	Fix SPEC1	2017-10-29 06:56:05 +01:00
Laurent Destailleur	5ba64fe620	Merge branch 'develop' into 7.0-pcg6	2017-10-27 01:42:03 +02:00
Laurent Destailleur	315fce701b	Fix migration pgsql	2017-10-26 18:46:44 +02:00
Laurent Destailleur	d1e7577eed	Fix sql field can't be named 'offset' (reserved word).	2017-10-26 18:30:01 +02:00
Laurent Destailleur	8058712d47	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php	2017-10-26 17:06:11 +02:00
Laurent Destailleur	ffee915498	Fix field not serial with pgsql	2017-10-26 15:10:52 +02:00
Laurent Destailleur	66d2c29fe1	Work on modulebuilder and website module	2017-10-26 01:02:13 +02:00
Laurent Destailleur	bb996019c2	NEW Support visibility on extrafields	2017-10-25 11:42:14 +02:00
Alexandre SPANGARO	ecbc393c96	FIX SPEC #7013 : use database type "numeric" to store monetary values	2017-10-24 21:14:31 +02:00
Alexandre SPANGARO	22d2598ea1	NEW Add The Moroccan chart of accounts	2017-10-24 19:23:09 +02:00
Laurent Destailleur	72441de1ec	Fix length of fk_mainmenu and fk_leftmenu	2017-10-24 17:35:53 +02:00
Laurent Destailleur	d2f723045c	Work on website and modulebuilder	2017-10-24 17:30:05 +02:00
Laurent Destailleur	e58a52c52b	Merge branch 'develop' into 7.0-pcg4	2017-10-24 12:59:59 +02:00
Laurent Destailleur	deeebac540	Merge branch 'develop' into 7.0-pcg3	2017-10-24 12:58:09 +02:00
Laurent Destailleur	110f2fc5da	Merge pull request #7695 from aspangaro/7.0-pcg2 NEW Add The Switzerland chart of accounts	2017-10-24 12:54:48 +02:00
Alexandre SPANGARO	eb6ba2ba55	NEW Add The Tunisia chart of accounts	2017-10-24 07:19:07 +02:00
Alexandre SPANGARO	9e673f7c87	NEW Add The Luxembourg chart of accounts	2017-10-24 07:07:28 +02:00
Alexandre SPANGARO	d43c186777	NEW : Add The accountancy Switzerland chart of accounts	2017-10-24 06:40:54 +02:00
Alexandre SPANGARO	8ba2fb8d4a	New : Add The developed accountancy french plan 2014	2017-10-24 06:05:19 +02:00
Laurent Destailleur	9df3f5c75e	Migration of data	2017-10-23 19:18:17 +02:00
Laurent Destailleur	f083ac5e6b	Prepare database to store country int accounting_system table	2017-10-23 18:56:09 +02:00
Laurent Destailleur	97b694b59c	Fix missing field in migration v6	2017-10-23 10:22:45 +02:00
Laurent Destailleur	f675be650e	Fix missing field in migration v6	2017-10-23 10:21:45 +02:00
Laurent Destailleur	1fe1cb986a	Fix AUTO_INCREMENT PRIMARY KEY does not need NOT NULL	2017-10-22 15:51:07 +02:00
Laurent Destailleur	efb369f857	Merge pull request #7497 from atm-florian/dev_accountancy NEW : lettrage in accountancy	2017-10-22 15:28:53 +02:00
Laurent Destailleur	611f5f638d	FIX #7616	2017-10-22 15:07:41 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +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
florian HENRY	4273e507c5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettrage.php htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php htdocs/accountancy/class/lettering.class.php	2017-10-18 09:52:56 +02:00
Laurent Destailleur	463441c808	Fix bad table name	2017-10-12 18:32:10 +02:00
Laurent Destailleur	1fba58b9ce	Fix bookmark list	2017-10-12 17:09:17 +02:00
Laurent Destailleur	37272b264c	Fix sql	2017-10-11 19:45:18 +02:00
Laurent Destailleur	bcf56e3140	Introduce table c_email_senderprofile to have several profils	2017-10-11 19:41:19 +02:00
Laurent Destailleur	cd814d420b	Fix repair utf8 mix collation	2017-10-11 16:54:17 +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
Laurent Destailleur	4de1ade605	Fix mix collation	2017-10-09 18:15:10 +02:00
Laurent Destailleur	15911a9b64	Fix illegal mix collation	2017-10-09 17:45:08 +02:00
Laurent Destailleur	19de053054	Fix itf8 mix collation	2017-10-09 17:43:57 +02:00
Laurent Destailleur	ce7ce82801	Enhance email template editor	2017-10-08 14:51:10 +02:00
Laurent Destailleur	8e187c2759	Debug module website	2017-10-06 22:49:08 +02:00
Laurent Destailleur	43d85af5ae	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 15:23:10 +02:00
Laurent Destailleur	afc1938676	FIX #7550	2017-10-06 14:28:01 +02:00
Laurent Destailleur	06b18a740e	NEW Add date of birth on user card. NEW Show expected worked hours on the timesheet form.	2017-10-06 12:08:01 +02:00
Laurent Destailleur	04a56d4bd9	Fix phpunit	2017-10-05 09:34:09 +02:00
Laurent Destailleur	75a7e086b3	Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element New comment generic element	2017-10-04 11:13:39 +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	97d399595f	Add unique key on table to follow leave request counter per type	2017-10-02 17:45:01 +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	94ae6c62e6	Add htmlheader field for each page	2017-10-02 00:08:00 +02:00
Laurent Destailleur	9654c4f168	New extrafields are visible into list by default	2017-09-29 13:29:48 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Laurent Destailleur	8242469e40	FIX The unique index on email templates can work now.	2017-09-27 18:16:28 +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
arnaud	f29ea35dc8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-27 14:56:52 +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	15c8515d53	Fix default	2017-09-26 19:08:04 +02:00
Laurent Destailleur	7f420f3246	Complete vat rates for india	2017-09-26 10:54:07 +02:00
Laurent Destailleur	4f76545b62	Add missing fields to manage localtax on supplier products	2017-09-26 10:47:08 +02:00
Laurent Destailleur	c9e9f60f8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-25 19:55:52 +02:00
Laurent Destailleur	c5287e68b1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/multicurrency.php htdocs/core/modules/modFournisseur.class.php	2017-09-25 19:54:27 +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	1bb5408d83	FIX #7464	2017-09-24 22:18:10 +02:00
Laurent Destailleur	63ec14e47d	Convert sode to send member info email into new generic email template system.	2017-09-22 20:18:11 +02:00
Laurent Destailleur	f990667b1a	NEW Can send email from the member card using email templates.	2017-09-22 17:48:38 +02:00
Laurent Destailleur	57358f0ce5	NEW Provide a way to download a file from a public URL for files in ECM	2017-09-21 14:02:42 +02:00
Laurent Destailleur	8dfa87fcf6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-19 19:30:28 +02:00
arnaud	e7bb7a3588	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-18 17:28:03 +02:00
arnaud	9795f48046	NEW comment system working with all objects	2017-09-18 17:27:29 +02:00
Laurent Destailleur	c11ff4a18c	FIX #7368	2017-09-18 15:55:25 +02:00
Laurent Destailleur	4c97f5514d	FIX #7366 renaming table with pgsql	2017-09-18 15:25:21 +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	d1fd1df345	Add column position on some dictionaries table	2017-09-17 22:52:29 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Alexandre SPANGARO	c2e1e2491d	Accountancy - Finish moving admin to specific menu & some cleaning	2017-09-16 06:53:29 +02:00
Laurent Destailleur	a4086b52ef	NEW Can send email from contract card	2017-09-16 01:34:15 +02:00
Laurent Destailleur	ffb3823655	Allow null in stock alert threshold to be compatible with #7162	2017-09-15 23:38:03 +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	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
Laurent Destailleur	24cd407cd3	FIX Missing upgrade of fields	2017-09-14 16:52:33 +02:00
Laurent Destailleur	5d920be880	FIX Upgrade missing on field	2017-09-14 16:51:41 +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	cda8c6e41a	Fix ref must be 50	2017-09-12 11:51:51 +02:00
Laurent Destailleur	f0f6df4c90	Fix tables declaration	2017-09-11 15:23:49 +02:00
Laurent Destailleur	1f56800a50	Merge pull request #7341 from atm-arnaud/NEW_task_discussion New task discussion	2017-09-11 15:20:13 +02:00
Regis Houssin	f8938f308d	Fix: remove table prefix	2017-09-11 08:17: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
Laurent Destailleur	974f99ddb2	Increase length of title field	2017-09-11 02:54:21 +02:00
Laurent Destailleur	2ae135baf1	NEW Add view of status of template invoice	2017-09-10 20:47:45 +02:00
Laurent Destailleur	e7abb39ee2	NEW Template invoices are visible on the customer tab	2017-09-10 19:28:20 +02:00
Laurent Destailleur	01664a135d	Removed not used field	2017-09-10 18:01:34 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	b7197530c2	NEW Each user can edit its own email template (menu tools)	2017-09-08 12:48:01 +02:00
arnaud	82440fd399	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion	2017-09-07 16:24:34 +02:00
arnaud	8906c95eea	NEW comments system on task	2017-09-07 16:23:51 +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	53a2ef45a5	Fix upgrade	2017-09-06 22:42:01 +02:00
Laurent Destailleur	451adb077f	Fix upgrade	2017-09-06 22:41:29 +02:00
Laurent Destailleur	08eff908bc	Fix missing field in some env	2017-09-06 21:39:33 +02:00
Laurent Destailleur	17310da0f8	Fix missing field in some env	2017-09-06 21:39:10 +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	7a6f3d899c	Fix initial data	2017-09-06 19:21:46 +02:00
Laurent Destailleur	33e2179b65	FIX SQL injection	2017-09-06 18:17:57 +02:00
Laurent Destailleur	f29a4c1fb1	Make accountancy pages responsive	2017-09-05 20:42:34 +02:00
Laurent Destailleur	f5ccd943f1	Fix mix of collation	2017-09-05 20:13:33 +02:00
Laurent Destailleur	e5400a4a36	Fix translation of extrafields	2017-09-02 13:01:41 +02:00
Laurent Destailleur	c1e54b7e23	Merge pull request #7315 from aspangaro/7.0-f2 NEW Add project on a various payment	2017-09-02 00:45:36 +02:00
Laurent Destailleur	d71359b634	Update data	2017-09-01 17:42:04 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Laurent Destailleur	e13792a555	Fix data for account categories	2017-09-01 15:31:35 +02:00
Alexandre SPANGARO	c4d2ca661f	Merge remote-tracking branch 'uptream/develop' into 7.0-f2 # Conflicts: # htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-01 07:24:55 +02:00
Laurent Destailleur	2ab12f54ff	Fix install error due to too large column with index	2017-08-31 22:42:14 +02:00
Laurent Destailleur	31a74d448c	Work on accounting reports.	2017-08-31 22:38:30 +02:00
Laurent Destailleur	8248bc1c64	Uniformize code of accounting report	2017-08-31 15:44:36 +02:00
Laurent Destailleur	6a3d110d3a	Enhance repair for utf8 mix collation	2017-08-31 14:44:32 +02:00
Laurent Destailleur	9146bb336e	Work on merging all payment modes in one page	2017-08-31 03: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
Alexandre SPANGARO	e081653cef	Add fk_projet in table various_payment	2017-08-30 06:38:33 +02:00
Laurent Destailleur	8f01db10a6	Fix setup for india	2017-08-29 13:41:55 +02:00
Laurent Destailleur	e9cdf85286	Fxi repeair of collation	2017-08-29 12:58:18 +02:00
Laurent Destailleur	9312005318	NEW Move accountancy features into a dedicated menu	2017-08-29 12:43:47 +02:00
Laurent Destailleur	b4769d37d6	Increase emailing title length	2017-08-28 00:06:38 +02:00
Laurent Destailleur	3f7eea2e0a	NEW Can set language on extrafields	2017-08-27 12:12:02 +02:00
Laurent Destailleur	c08d0aeda5	Clean duplicate accounting account	2017-08-26 21:01:26 +02:00
John	0653a5d177	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec	2017-08-24 14:35:01 +02:00
Laurent Destailleur	326d3df63f	FIX select of category FIX pb with extrafield list and key '0' Conflicts: htdocs/core/class/extrafields.class.php	2017-08-24 13:28:56 +02:00
Laurent Destailleur	7da6f93d7e	FIX select of category FIX pb with extrafield list and key '0'	2017-08-24 13:23:15 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
Laurent Destailleur	4c243d3b9e	Fix index declaration must be moved into the .key.sql files.	2017-08-23 15:18:54 +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
John	b18104788e	New extrafield on facture_rec	2017-08-22 15:22:41 +02:00
Laurent Destailleur	30c39d246b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-22 11:18:56 +02:00
Laurent Destailleur	206d46cbb7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: scripts/cron/cron_run_jobs.php	2017-08-22 11:18:17 +02:00
Laurent Destailleur	41ce4886fd	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-08-22 11:15:30 +02:00
Laurent Destailleur	4f6363bff8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-21 00:49:47 +02:00
Laurent Destailleur	188653a85d	Work on website module	2017-08-20 18:50:51 +02:00
Laurent Destailleur	1101a1094f	Fix translation and migration	2017-08-20 16:07:38 +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	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
Laurent Destailleur	bfa8630feb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-08-07 20:07:36 +02:00
Laurent Destailleur	0bf4ac6fb3	Add missing field fk_supplier_proposal	2017-08-07 20:06:26 +02:00
Laurent Destailleur	0960473c9b	More complete repair of unicode field	2017-08-07 15:51:30 +02:00
Laurent Destailleur	1c157c7c3d	Fix pb with mix collation. Add a way to fix this in repair.	2017-08-04 21:23:40 +02:00
Laurent Destailleur	e039f7cc22	Complete repair script	2017-08-04 16:37:24 +02:00
florian HENRY	8fd45383e2	NEW : manageme extrafields with multientity	2017-08-04 09:00:11 +02:00
Laurent Destailleur	a8d9dff506	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 19:32:08 +02:00
Laurent Destailleur	d2b662c671	Add field fk_user in bookkeeping (the user who valiated the accounting document. Will be used for statistics purpose only).	2017-07-31 19:31:52 +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	69357dd91c	Merge pull request #7113 from atm-ph/new_develop_expense_report NEW Add expense report rules and ik	2017-07-31 02:33:49 +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
atm-ph	1f3f9e40b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-27 16:01:53 +02:00
Laurent Destailleur	e5a5d537aa	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-26 19:30:45 +02:00
Laurent Destailleur	c6480af217	Enhance the repair script	2017-07-26 18:47:35 +02:00
Laurent Destailleur	7b34859bc8	Fix collation	2017-07-26 16:14:18 +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	fb5a7370bf	Add missing field	2017-07-25 21:40:55 +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	b7c4f1f086	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/compta/facture.php	2017-07-25 21:05:15 +02:00
Laurent Destailleur	67a442cd9a	Uniformize fields	2017-07-24 11:53:57 +02:00
Laurent Destailleur	25b107defb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 19:09:00 +02:00
Regis Houssin	2efb86b5d8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-23 10:36:14 +02:00
Laurent Destailleur	437d620fe4	Add support of language in website module	2017-07-22 20:01:29 +02:00
Laurent Destailleur	854a6ca3d5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-22 16:40:45 +02:00
Laurent Destailleur	5207b84e8b	Fix compatibility with indian IGST/CSGST/SGST	2017-07-22 01:56:38 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	3716645b8b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-21 15:03:21 +02:00
Laurent Destailleur	d07741ada1	Merge branch 'develop' into patch-rib	2017-07-21 14:58:33 +02:00
Laurent Destailleur	aacef21cb8	Can clone a page	2017-07-21 13:38:13 +02:00
Laurent Destailleur	7760594643	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang htdocs/theme/eldy/style.css.php htdocs/websites/class/website.class.php htdocs/websites/index.php	2017-07-20 18:31:58 +02:00
Laurent Destailleur	2f3128410b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-20 16:49:56 +02:00
Laurent Destailleur	84f621fde3	Fix migration on pgsql	2017-07-19 16:31:15 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Laurent Destailleur	6e77dab832	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-07-18 15:13:15 +02:00
Laurent Destailleur	cfbd47bd78	Fix field null	2017-07-18 14:09:37 +02:00
Maxime Kohlhaas	76eac7ce6a	Fix : creating user from member was failing due to column size difference	2017-07-18 10:13:10 +02:00
gauthier	ccbeb162cf	FIX : Buying prices must always be in positive valueo	2017-07-17 11:27:57 +02:00
Regis Houssin	9bb1431fd9	Fix: change version	2017-07-16 08:06:58 +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	75ec7a309c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-15 21:25:14 +02:00
Laurent Destailleur	ab6646d16b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/compta/bank/bankentries.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-07-15 03:54:50 +02:00
Laurent Destailleur	cb87b314be	FIX Maxi debug of journalization of bank journal.	2017-07-15 03:41:07 +02:00
Laurent Destailleur	3ac85e10c5	NEW Add mass action "validate" on supplier invoices. NEW Add date_valid and date_pointoftax on supplier invoices.	2017-07-14 14:40:09 +02:00
Laurent Destailleur	652d715fdc	Better translation	2017-07-13 18:18:56 +02:00
Laurent Destailleur	3db7bd7624	Fix look and feel v6	2017-07-13 17:44:12 +02:00
Laurent Destailleur	be8e15a777	Prepare fix	2017-07-13 16:25:38 +02:00
Laurent Destailleur	43f6eab2ea	FIX #7146	2017-07-13 15:16:17 +02:00
Laurent Destailleur	13cee53384	Update 5.0.0-6.0.0.sql	2017-07-13 14:26:10 +02:00
florian HENRY	67664331e3	Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing	2017-07-12 17:49:44 +02:00
florian HENRY	379a5b9e16	fix : SQL migration in capital letters	2017-07-12 12:35:30 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
florian HENRY	017b654acd	FIX PgSQL	2017-07-11 17:45:16 +02:00
florian HENRY	c85bf18f0e	Fix AdvtargetEmailing	2017-07-11 14:47:37 +02:00
Laurent Destailleur	be09c911ce	Debug module websites	2017-07-10 23:44:46 +02:00
Laurent Destailleur	bb2dc59c56	More complete request to clean	2017-07-10 11:29:09 +02:00
Laurent Destailleur	3c576dcf21	Fix bad name of tables	2017-07-09 20:57:45 +02:00
Laurent Destailleur	b61f7c0179	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 22:17:29 +02:00
Laurent Destailleur	65ea0fc2b4	FIX value of user id filled to 0 in llx_bank_url when recording an expense report.	2017-07-08 22:16:35 +02:00
Laurent Destailleur	a562e5a919	Maxi debug of accountancy ledger page.	2017-07-08 20:52: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	552031799d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-07 19:42:37 +02:00
Laurent Destailleur	b7af0cca63	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture/list.php htdocs/holiday/card.php	2017-07-07 19:39:57 +02:00
Laurent Destailleur	0a7a092080	FIX Missing ref	2017-07-07 19:17:53 +02:00
Laurent Destailleur	4c1b485d47	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/compta/facture/list.php	2017-07-07 19:06:25 +02:00
phf	6ab0ec4b1b	Fix travis and rename 2 fields	2017-07-07 10:22:37 +02:00
phf	b8865c425f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
phf	1beec51928	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
phf	42183877e8	Fix sql syntax	2017-07-04 09:30:53 +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	db1d97c9ac	Fix bad value for ref of old contracts	2017-07-03 02:09:14 +02:00
Laurent Destailleur	aa1351d483	Fix to be sure database is not created using utf8mb4 (not yet supported)	2017-07-03 01:10:09 +02:00
Laurent Destailleur	efecb32ec9	Fix migration	2017-07-03 00:11:22 +02:00
Laurent Destailleur	b95dea3b50	Fix missing ;	2017-07-02 23:37:52 +02:00
Laurent Destailleur	727085f3ec	Fix missing migration column zip	2017-06-30 19:01:49 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	c213624c14	Fix migration into product_lot	2017-06-27 16:42:37 +02:00
Laurent Destailleur	3b7667292b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-27 11:59:40 +02:00
Laurent Destailleur	75006f9970	Fix data	2017-06-26 13:30:14 +02:00
Laurent Destailleur	3a6314b1a0	Fix data	2017-06-26 13:29:18 +02:00
Laurent Destailleur	6298436a1b	Clean old lot numbers	2017-06-25 02:26:30 +02:00
Laurent Destailleur	64eef9f89c	Fix compatibility with pgsql	2017-06-22 11:04:15 +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	f1701469e0	NEW data files are now also parsed by phpunit for sql syntax	2017-06-20 13:28:34 +02:00
Laurent Destailleur	095155a58b	Enhance sql quality. Refused double quotes into sql content.	2017-06-20 10:06:17 +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	2695cc416e	Fix comment	2017-06-19 21:06:16 +02:00
Laurent Destailleur	24f7128742	Fix pb with postgresql	2017-06-19 21:04:46 +02:00
Laurent Destailleur	64d8b97afe	Fix sql syntax errors	2017-06-19 20:35:14 +02:00
Laurent Destailleur	099ef585b2	Fix pgsql	2017-06-19 20:07:33 +02:00
Laurent Destailleur	1745d06bb7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-06-19 19:56:16 +02:00
Laurent Destailleur	12d7b92556	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8	2017-06-19 19:52:49 +02:00
Laurent Destailleur	bdeddd3617	Fix pgsql migration	2017-06-19 19:48:19 +02:00
Laurent Destailleur	6fb0fc7b71	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7	2017-06-19 19:42:56 +02:00
Laurent Destailleur	f694939fc7	Fix migration with pgsql	2017-06-19 19:39:37 +02:00
Laurent Destailleur	3c73b426d7	Fix migration. Must make reload only on last version step.	2017-06-19 18:32:18 +02:00
Laurent Destailleur	c8b4ab87cb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-19 15:08:10 +02:00
Laurent Destailleur	241ec01adf	FIX #7031 missing change column "state_id" since dolibarr 3.5 !!	2017-06-19 15:07:55 +02:00
Laurent Destailleur	cffb368bbd	Merge pull request #7030 from aspangaro/6.0-fec3 Fix : Accountancy - Debug and add information in database	2017-06-19 15:02:30 +02:00
Regis Houssin	544d051fe3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-19 07:06:57 +02:00
Laurent Destailleur	caf48f32c4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-19 03:01:01 +02:00
Laurent Destailleur	43f25b49a1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-06-19 03:00:29 +02:00
Laurent Destailleur	5cd5986211	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-06-19 02:59:49 +02:00
Laurent Destailleur	39419bb411	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-06-19 02:59:16 +02:00
Laurent Destailleur	774c624687	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8	2017-06-19 02:58:44 +02:00
Laurent Destailleur	52eeeebac9	Fix bad data in sql dump	2017-06-19 02:57:49 +02:00
Laurent Destailleur	5439390461	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7	2017-06-19 02:57:12 +02:00
Laurent Destailleur	6fc4dacd42	Fix migration opensurvey	2017-06-19 02:55:33 +02:00
Laurent Destailleur	8d84277e8c	Complete repair script	2017-06-19 02:18:04 +02:00
Alexandre SPANGARO	e9b6afd2aa	Add last session coding - Add temporaly ledger	2017-06-18 22:17:32 +02:00
Regis Houssin	dcc152d4a4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-18 06:52:20 +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	81f1a34112	Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values"	2017-06-16 13:06:35 +02:00
Laurent Destailleur	549bb2c55f	Merge pull request #7020 from aspangaro/7.0-1 Fix SPEC #7013 : use database type "numeric" to store monetary values	2017-06-16 12:59:52 +02:00
Laurent Destailleur	e813fd2dfa	Fix missing key import_key and extraparams	2017-06-16 12:57:30 +02:00
Alexandre SPANGARO	f424f96589	Fix SPEC #7013 : use database type "numeric" to store monetary values	2017-06-16 05:15:00 +02:00
Laurent Destailleur	8b7ca1f280	Fix missing vat_src_code into table of expense report	2017-06-15 21:27:20 +02:00
Laurent Destailleur	097be322a6	Modify code to match new v6 structure.	2017-06-15 19:29:00 +02:00
Laurent Destailleur	71c0be20b9	Change data structure for bookkeeping v6	2017-06-15 10:30:32 +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	ecf29332f3	Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor NEW Blokedlog stuff	2017-06-12 17:44:27 +02:00
Alexis Algoud	0312d2479d	add block info popin, translation, hidden authority feature	2017-06-12 10:26:24 +02:00
Laurent Destailleur	ca324346e4	Update doc	2017-06-11 19:08:40 +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
Alexis Algoud	11d2a5538b	fix entity default value and add link to download blockchain	2017-06-11 00:03:01 +02:00
Laurent Destailleur	36b18f0300	Save MAIN_VERSION_FIRST_INSTALL that is not erased.	2017-06-10 22:11:12 +02:00
Alexis Algoud	63b3010c2e	fix sql	2017-06-10 09:28:07 +02:00
Alexis Algoud	3d5899edf3	final blockedlog init	2017-06-10 09:25:32 +02:00
Regis Houssin	fc08adff0f	Fix: syntax error	2017-06-09 14:44:29 +02:00
alexis Algoud	9b3b2e600f	init blockedlog trigger and hash store	2017-06-08 17:52:02 +02:00
Regis Houssin	ade915af5f	New: add dictionnary sharing (multicompany)	2017-06-08 16:36:42 +02:00
Regis Houssin	1baa620688	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 10:33:26 +02:00
Regis Houssin	44dba391c1	New: add dictionnary sharing (multicompany)	2017-06-08 10:24:16 +02:00
Regis Houssin	bb37c2f980	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 13:54:33 +02:00
Laurent Destailleur	4bda7fcafc	Merge pull request #6949 from aspangaro/6.0-vat2 NEW : VAT payment v6 look and feel	2017-06-06 11:08:50 +02:00
Regis Houssin	7ed0643b52	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 10:54:16 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Alexandre SPANGARO	e547aa8aee	NEW : VAT payment v6 look and feel	2017-06-05 15:41:33 +02:00
Alexandre SPANGARO	806d25ae41	Activate multi-journal on expensereport journal	2017-06-05 06:44:53 +02:00
Laurent Destailleur	af01e544d5	Merge branch 'develop' into fix_develop_missing_entity_column	2017-06-03 01:11:49 +02:00
Laurent Destailleur	4e397107e1	Merge pull request #6934 from atm-florian/dev_loancalc NEW : Add calculation function for Loan schedule	2017-06-03 01:10:39 +02:00
atm-ph	70a188c042	Fix missing column entity on llx_accounting_journal after init demo with the bash	2017-06-02 21:45:02 +02:00
florian HENRY	b0f2db7aaa	NEW : Add calculation function for Loan schedule	2017-06-02 17:48:29 +02:00
Laurent Destailleur	447db1b324	Fix orphelins for categories tables	2017-06-02 13:46:30 +02:00
Laurent Destailleur	9b4c929d79	NEW Add phpunit to check the engine is defined into sql create files.	2017-06-01 16:09:09 +02:00
Laurent Destailleur	733d1caac6	Correct usage of parameter 'none' in GETPOST	2017-06-01 12:37:16 +02:00
Laurent Destailleur	c9a09adf79	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/main.lang	2017-05-31 12:50:29 +02:00
Laurent Destailleur	d2813eabbc	FIX #6877 Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-05-29 13:41:59 +02:00
Laurent Destailleur	4824942369	FIX #6877	2017-05-29 13:39:07 +02:00
Laurent Destailleur	1da648402d	Merge pull request #6886 from hregis/develop_bug Fix: use encrypt for llx_const data	2017-05-29 10:16:07 +02:00
Laurent Destailleur	d19a8929df	Merge pull request #6875 from atm-ph/fix_develop_ref_column_inventory Fix missing column ref on migration for inventory	2017-05-29 10:11:26 +02:00
Laurent Destailleur	e5fe629a0e	NEW Extrafields support formulas to be computed using PHP expressions	2017-05-24 22:48:44 +02:00
Regis Houssin	55121c5e05	Fix: use encrypt for llx_const data	2017-05-24 16:35:02 +02:00
Laurent Destailleur	cea98ce5cb	Look and feel v6	2017-05-23 15:30:56 +02:00
Laurent Destailleur	80ce8da7a3	Fix migration errors and responsive design	2017-05-23 15:13:52 +02:00
phf	9bc60b8aa5	Fix missing column ref on migration for inventory	2017-05-22 09:26:10 +02:00
Laurent Destailleur	80cbc28385	NEW Add REST API to push a file.	2017-05-20 15:52:36 +02:00
Laurent Destailleur	e340a53f7c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-20 11:58:50 +02:00
Laurent Destailleur	df05980c3a	Prepare table of notification per object (exemple agenda events)	2017-05-20 10:42:45 +02:00
Alexandre SPANGARO	1da0959a3a	Merge remote-tracking branch 'uptream/develop' into 6.0-grh	2017-05-20 08:03:29 +02:00
Alexandre SPANGARO	4ff9607011	Update table accounting_bookeeping to prepare FEC format and harmonization	2017-05-20 07:56:33 +02:00
Laurent Destailleur	330b9e7038	Merge pull request #6866 from absnc/project_element_shipping NEW Enable shipments in Project overview tab	2017-05-19 17:10:51 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
absnc	7b784a1dcb	Enable shipments for project overview tab	2017-05-19 17:50:10 +11:00
Laurent Destailleur	56989ae5af	Add missing fields making not possible to enter reference price of products into another currency	2017-05-17 15:10:45 +02:00
Laurent Destailleur	ce84990414	NEW On invoices generated by template, we save if of source template.	2017-05-16 02:46:19 +02:00
Laurent Destailleur	9b550ae178	Fix migration of accountancy_journal from char to num.	2017-05-14 12:54:26 +02:00
Laurent Destailleur	b5b97816c8	FIX #6803	2017-05-13 14:06:14 +02:00
Laurent Destailleur	6f9e67b1fb	Remove no more used constant	2017-05-13 13:08:25 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	5581e5da72	FIX New vat code not correctly implemented if "1 price per customer".	2017-05-12 13:12:17 +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	1c7d9b9d9a	Merge pull request #6804 from aspangaro/6.0-multijournal New : Accountancy - Add a list to select the bank journal in bank card	2017-05-10 22:46:30 +02:00
Laurent Destailleur	52de60c49b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-10 18:17:58 +02:00
Laurent Destailleur	002bebd837	Fix missing extraparams make sql syntax error	2017-05-10 18:15:01 +02:00
Laurent Destailleur	fe8d34c73b	Add field extraparams on llx_bank_account	2017-05-10 17:50:10 +02:00
Laurent Destailleur	8781f6bcf2	Add vat code on predefined invoice	2017-05-10 14:53:20 +02:00
Laurent Dinclaux	2b7dcfa56d	Add missing vat_src_code field to predefined invoices table	2017-05-09 21:07:32 +11:00
Laurent Destailleur	9fe28c9b2c	NEW Can disable all overwrote translations in one click.	2017-05-09 10:08:04 +02:00
Alexandre SPANGARO	7c4b47f20d	Update works	2017-05-06 08:33:12 +02:00
Alexandre SPANGARO	68aaef2f66	Add list to select journal in bank	2017-05-06 08:06:01 +02:00
Laurent Destailleur	fc5f4007a1	Debug accountancy module. Page for bank journalization is still KO.	2017-05-05 16:54:05 +02:00
Laurent Destailleur	885a636351	Debug new journal list page	2017-05-05 16:35:05 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	f069ef9844	FIX #6767	2017-05-05 09:16:11 +02:00
Laurent Destailleur	f32d19fb73	FIX #6767 serious critical error no login possible	2017-05-05 09:15:14 +02:00
Laurent Destailleur	8009370f04	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/contact/document.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/repair.sql	2017-05-04 10:01:11 +02:00
Laurent Destailleur	b8f5e93ab0	Debug inventory data model	2017-05-02 21:40:18 +02:00
Laurent Destailleur	0bc46facd7	Add missing vat_src_code on recurring invoices	2017-05-02 21:24:18 +02:00
Laurent Destailleur	31d99bbfe6	Complete event tracked automatically	2017-05-02 12:17:25 +02:00
Laurent Destailleur	b57bf6460b	Start debug inventory	2017-04-30 02:34:00 +02:00
Laurent Destailleur	50d65e3a9f	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/install/mysql/migration/repair.sql	2017-04-29 17:40:47 +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	0ba6433a61	Work on module website	2017-04-28 13:10:08 +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	e97fae0c43	Fix typo	2017-04-27 12:10:08 +02:00
Laurent Destailleur	1c20bbb287	NEW Add index and constraints keys on supplier proposal detail table	2017-04-26 12:11:33 +02:00
Laurent Destailleur	a2287fd183	Add example of sql request to fix llx_product_price	2017-04-24 13:46:41 +02:00
Laurent Destailleur	e97e202deb	NEW Can import users	2017-04-17 04:22:53 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	a73d72f243	Add tables for default values	2017-04-14 10:14:23 +02:00
Laurent Destailleur	9678c2128e	Add field langs into extrafields definition table	2017-04-03 10:29:20 +02:00
Laurent Destailleur	cab944a1a1	Merge pull request #6602 from aspangaro/6.0-multijournal New : [FP17] Accounting multi-journals	2017-03-31 17:45:10 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +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	6bf61c677f	FIX #6586 Introduce processing status	2017-03-28 13:20:31 +02:00
Alexandre SPANGARO	fc2b9a858b	New : [FP17] Add multijournals in accountancy admin	2017-03-28 06:35:03 +02:00
Alexandre SPANGARO	aa924bf010	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal # Conflicts: # htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-03-27 22:35:06 +02: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	e3afa06cf3	Fix inventory sql	2017-03-25 18:01:43 +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	53a04703d6	Uniformize code	2017-03-23 16:10:38 +01:00
gauthier	6cecab4c92	FIX : forgottent fk_unit field on llx_supplier_propaldet	2017-03-22 16:43:12 +01:00
Alexandre SPANGARO	6d5578a876	Reactivated constant BANK_DISABLE_DIRECT_INPUT	2017-03-19 20:47:30 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Alexandre SPANGARO	0e910616b6	Update table	2017-03-19 07:25:19 +01:00
Laurent Destailleur	5871d59db9	Fix error "Invalid default value for 'date_price'"	2017-03-18 15:25:49 +01:00
Alexandre SPANGARO	8328c04624	2nd step : Add table	2017-03-18 08:12:29 +01:00
Alexandre SPANGARO	16b12b33fc	First step : remove BANK_DISABLE_DIRECT_INPUT	2017-03-18 07:24:55 +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
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	832c91417a	Fix the default_vat_code was not correctly saved and shown on the product price.	2017-03-04 19:16:09 +01:00
Laurent Destailleur	5d18aad15f	Add the vat_code on all table of prices	2017-03-04 14:18:04 +01:00
Laurent Destailleur	bef5f2c236	FIX #6465	2017-03-03 15:06:17 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	57b532cdd0	Fix status of opportunity is required if an amount is defined	2017-03-02 12:56:22 +01:00
Laurent Destailleur	8487f0fc96	Fix missing setup of new option	2017-03-01 11:18:11 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Laurent Destailleur	1ef899dacc	Prepare database to follow supplier discounts	2017-02-24 15:22:32 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
Laurent Destailleur	847f408508	More complete repair	2017-02-17 20:47:22 +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
Alexandre SPANGARO	c06aedc54d	[FP17] : Add data in llx_accountancy_journal	2017-02-15 20:55:52 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	f4e64685e8	Merge pull request #6397 from apachler/develop added additional payment terms often needed in Austria	2017-02-08 16:47:40 +01:00
Laurent Destailleur	072fa9987b	Update 4.0.0-5.0.0.sql	2017-02-08 16:47:27 +01:00
Andreas Pachler	c45b40075d	fixed typos	2017-02-08 12:55:03 +01:00
Andreas Pachler	ae3ace7e94	added additional payment terms often needed in Austria	2017-02-08 12:46:42 +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	b0ee04c079	FIX #6379	2017-02-07 01:13:50 +01:00
Laurent Destailleur	2d77cb2da5	FIX #6379	2017-02-07 00:54:54 +01:00
Marcos Garcí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	218e49298a	Uniformize field names	2017-01-31 14:10:06 +01:00
Laurent Destailleur	4cec071af5	Add tms field	2017-01-31 14:00:53 +01:00
Laurent Destailleur	fcfea4e6d1	Add missing field fk_user_modif	2017-01-27 13:26:31 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Alexis Algoud	65b956b011	NEW sql for inventory	2017-01-09 10:33:33 +01:00
Laurent Destailleur	e9853f3cd7	Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into Franck-MOREAU-develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/loan/card.php htdocs/loan/class/loan.class.php htdocs/projet/element.php	2017-01-07 17:45:05 +01:00
Laurent Destailleur	728dd3f7b3	Add field ref into ecm_files table.	2017-01-03 11:06:24 +01:00
Laurent Destailleur	598e559563	Fix migration	2017-01-02 19:30:12 +01:00
Laurent Destailleur	afe5c6b296	Fix migration	2017-01-02 18:44:11 +01:00
Ion Agorria	522fb4cf7a	Add email template for each line in object	2016-12-31 17:39:01 +01:00
Laurent Destailleur	f1961b0207	Work on sorting/indexing upload files	2016-12-31 03:43:22 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Marcos Garcí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	46a8041143	Clean orphelins	2016-12-23 15:22:25 +01:00
Laurent Destailleur	cb4e0233b9	Fix orphelins	2016-12-23 15:21:38 +01:00
Laurent Destailleur	08449a2d4f	Prepare action tracking on products	2016-12-20 12:05:00 +01:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Laurent Destailleur	e1a5a90f0a	NEW Uploaded files are indexed into database	2016-12-13 00:15:21 +01:00
Laurent Destailleur	71d2ee3aa9	Fix default of a column	2016-12-12 20:30:21 +01:00
Juanjo Menent	829ff2299e	Fix: Delete surplus migration file	2016-12-10 12:46:26 +01:00
Laurent Destailleur	3396dfc7f6	NEW Index upload files into database.	2016-12-08 22:12:45 +01:00
Laurent Destailleur	788cbf9a01	Complete work on dol_banner on contracts	2016-12-04 13:30:17 +01:00
Laurent Destailleur	888c4cd2ad	Fix corrupted value for pointoftax field	2016-12-03 20:15:56 +01:00
Laurent Destailleur	17bc24e83e	Complete repair	2016-12-03 20:05:49 +01:00
Laurent Destailleur	fb2f33cfac	FIX Clean corrupted data	2016-12-03 19:48:08 +01:00
Laurent Destailleur	495ba00cb6	Fix: Slurp, database corruption due to missing unique key on main key.	2016-12-02 14:21:46 +01:00
Laurent Destailleur	39c2088aa5	Fix constant	2016-11-29 11:23:15 +01:00
Laurent Destailleur	83972b39ce	Complete work on dol_banner. Fix errors due to missing columns.	2016-11-28 23:58:36 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	e6fb118155	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-11-26 15:52:17 +01:00
Laurent Destailleur	b63ad019ce	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-11-26 15:49:11 +01: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
florian HENRY	44aa601848	again revert to fk_project instead of fk_projet	2016-11-16 11:11:50 +01:00
florian HENRY	a251f0df51	Various fix on Loan and project link	2016-11-16 09:38:13 +01:00
moreauf	f97bab6fb8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-15 08:35:25 +01:00
moreauf	081be37787	NEW: Add project and Hook to Loan BUG: Correct discard_closed parametters management in project	2016-11-14 19:25:50 +01:00
florian HENRY	7bf6ad49da	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-14 12:23:17 +01:00
florian HENRY	37a9f15fb4	FIX : increase size of llx_c_actioncomm type column	2016-11-14 12:21:08 +01:00
Laurent Destailleur	af2f4cf78d	Merge branch 'patch-20' of https://github.com/defrance/dolibarr into defrance-patch-20 Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/install/mysql/tables/llx_facturedet.sql	2016-11-12 13:36:45 +01:00
Laurent Destailleur	645eee57db	Fix syntax error	2016-11-12 11:22:18 +01:00
Regis Houssin	97a8a84b9d	Fix: missing encrypt/decrypt with llx_const	2016-11-12 09:57:41 +01:00
Regis Houssin	a1cccc021e	Fix: missing encrypt data for llx_const	2016-11-12 09:48:34 +01:00
BENKE Charlie	056e26e595	Update 4.0.0-5.0.0.sql	2016-11-11 15:05:56 +01:00
Laurent Destailleur	787f508172	More complete fix for #5974	2016-11-11 14:25:22 +01:00
Laurent Destailleur	360d697fc3	Add missing field to store result of email sending	2016-11-11 13:45:18 +01:00
Laurent Destailleur	fe9c880984	NEW Add missing unique key on table llx_links	2016-11-10 14:24:29 +01:00
Laurent Destailleur	bc245165c0	Merge pull request #5961 from defrance/patch-40 When constant change, please add update of constant	2016-11-08 14:35:50 +01:00
Laurent Destailleur	608ca669fd	Update doc Add missing table in upgrade script	2016-11-07 03:18:53 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
BENKE Charlie	b3fdf4b872	Update 4.0.0-5.0.0.sql	2016-11-06 14:49:16 +01:00
BENKE Charlie	29196eedde	When constant change, please add update of constant	2016-11-06 12:03:28 +01:00
Laurent Destailleur	3fbba59f69	Better management of status of events	2016-10-30 13:12:35 +01:00
Laurent Destailleur	c858c5b39b	Merge pull request #5941 from simnandez/develop Fix bad sql query introduced by #38e6c9c	2016-10-29 17:50:10 +02:00
Laurent Destailleur	69fe2bfad6	Fix a case of corrupted data	2016-10-29 17:16:14 +02:00
Laurent Destailleur	cb3f0dadab	NEW Can see/edit the customer ref of a shipment	2016-10-29 14:52:13 +02:00
Juanjo Menent	9bd44185c7	Fix bad sql query introduced by #38e6c9c	2016-10-29 14:46:57 +02:00
Laurent Destailleur	38e6c9cc57	Fix multientity on overwritting translation not yet supported.	2016-10-28 22:47:37 +02:00
aspangaro	883446c5bb	Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 Conflicts: htdocs/core/menus/standard/eldy.lib.php	2016-10-25 22:09:40 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
aspangaro	6e7f104c5f	Update works	2016-10-25 07:41:01 +02:00
Laurent Destailleur	f1421a2ee4	Rename constant with english name	2016-10-24 13:10:35 +02:00
Laurent Destailleur	fdcc858008	Merge branch 'dev_resource_extrafields' of https://github.com/atm-florian/dolibarr into atm-florian-dev_resource_extrafields Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 02:05:34 +02:00
Laurent Destailleur	3c3c5d06a1	Merge branch 'NEW_parent_warehouse' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-NEW_parent_warehouse Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 00:58:02 +02:00
Laurent Destailleur	abc471575a	Fix sql error	2016-10-22 17:00:19 +02:00
Laurent Destailleur	d18097da28	Prepare database to manage different vat rate with same rate value.	2016-10-21 14:09:11 +02:00
florian HENRY	54a154fa4f	NEW : Add ressource extrafields	2016-10-19 22:14:51 +02:00
Laurent Destailleur	850a275b47	Fix duplicate accounting account with same number. Add unique key.	2016-10-14 18:46:30 +02:00
Laurent Destailleur	79d376ee12	Debug accountancy module	2016-10-14 13:05:01 +02:00
gauthier	805b65addd	FIX : semicolon	2016-10-14 12:02:24 +02:00
gauthier	416311a7b9	NEW : allow to save a parent warehouse # Conflicts: # htdocs/product/stock/card.php	2016-10-14 11:29:14 +02:00
Laurent Destailleur	c908af6758	Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month NEW Develop new cdr (current or next month) for payment terms.	2016-10-07 00:06:59 +02:00
Laurent Destailleur	a91f93eeda	Merge pull request #5831 from atm-florian/dev_fix5764_for_PgSQL FIX : New add limit stock product by warehouse #5764 for PgSQL	2016-10-07 00:00:53 +02:00
Laurent Destailleur	9ad96c2be3	Debug module accountancy expert	2016-10-05 20:50:47 +02:00
Laurent Destailleur	dff7f73dc9	Better terminology	2016-10-05 18:31:55 +02:00
Laurent Destailleur	31ce725d73	Maxi debug of accountancy expert module	2016-10-04 19:31:05 +02:00
gauthier	71eb4ff1a0	NEW : ALTER TABLE in migration script	2016-10-04 16:07:23 +02:00
Laurent Destailleur	3599f2c840	Uniformize code for recurring invoices	2016-10-04 12:31:45 +02:00
florian HENRY	d3146234b8	FIX : New add limit stock product by warehouse #5764 for PgSQL	2016-10-04 09:23:13 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	96426de416	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-10-01 19:25:35 +02:00
Laurent Destailleur	56ae7bf328	Merge pull request #5822 from aspangaro/4.0-p1 Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor	2016-10-01 19:00:41 +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	b45ea754ec	FIX #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be varchar.	2016-10-01 16:58:35 +02:00
Laurent Destailleur	fcb00dbaf2	Fix missing unique key	2016-10-01 16:53:33 +02:00
aspangaro	34cad213da	Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor.	2016-10-01 07:37:26 +02:00
Laurent Destailleur	2a6d8e77db	FIX Lost filter on opportunities	2016-09-30 11:45:36 +02:00
Laurent Destailleur	8fc857fdcb	Missing entity in the bookkeeping table	2016-09-29 10:10:32 +02:00
arnaud	c904b8030c	Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD Conflicts: htdocs/langs/en_US/users.lang	2016-09-27 15:25:29 +02:00
arnaud	b717d530cd	NEW User date of employment added	2016-09-27 15:16:16 +02:00
Laurent Destailleur	0ab3728276	Merge pull request #5780 from aspangaro/5.0-p14 Review of subscription	2016-09-26 01:09:50 +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
Laurent Destailleur	3eaec4d4b8	Uniformise fields in tables	2016-09-23 10:55:44 +02:00
Laurent Destailleur	8fa8bc7d34	Rename table for a better understanding	2016-09-22 11:39:43 +02:00
gauthier	576ef9e541	FIX : sql syntax for travis test	2016-09-21 09:31:40 +02:00
gauthier	d508d44fef	NEW : migration script from 4.0.0 to 5.0.0 and langs	2016-09-20 12:10:25 +02:00
Laurent Destailleur	c4c7ccc226	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php	2016-09-19 14:05:16 +02:00
Laurent Destailleur	97e396af69	Work on module website	2016-09-17 21:03:20 +02:00
Laurent Destailleur	20141ec9bc	Fix default value of new table	2016-09-12 17:31:36 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
Laurent Destailleur	ce137e3987	Fix migration when field was added without null flag.	2016-09-10 17:58:13 +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
phf	7229b572dc	Default entity 1 in llx_multicurrency_rate	2016-09-08 14:59:16 +02:00
phf	7917169961	Fix miss entity column in llx_multicurrency_rate	2016-09-08 14:53:59 +02:00
florian HENRY	abda9146f1	FIX : cannot add order line (if fk column is not in user they whould be NULL by defaut.	2016-09-07 11:32:45 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
Laurent Destailleur	898bbd6031	NEW Support extrafields for expense reports	2016-09-06 13:00:32 +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	91ede48390	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-01 11:37:40 +02:00
Laurent Destailleur	f04a3bf0c8	Fix sql error	2016-08-31 18:46:47 +02:00
Laurent Destailleur	3edb04c5b8	Fix missing migration to create entity	2016-08-31 12:54:44 +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	867525cc91	Fix missing migration instructions	2016-08-29 17:50:31 +02:00
Laurent Destailleur	c49c23df3d	Fix debug project categories	2016-08-29 17:30:54 +02:00
Laurent Destailleur	b8201c9f86	Fix fk_soc can be null because we can set notification for users only.	2016-08-28 23:46:12 +02:00
Laurent Destailleur	2e7e5151b7	Merge pull request #5463 from hregis/develop_origin New: Add entity field in llx_societe_remise_except and llx_societe_remise	2016-08-28 12:23:04 +02:00
Regis Houssin	6e40f9e700	Merge remote-tracking branch 'dolibarr/develop' into develop_origin Conflicts: htdocs/core/class/html.form.class.php Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59	2016-08-25 10:15:26 +02:00
BENKE Charlie	777b9fe4d8	Update 4.0.0-5.0.0.sql	2016-08-23 11:28:10 +02:00
BENKE Charlie	8707bb04fb	Update 4.0.0-5.0.0.sql	2016-08-17 16:38:02 +02:00
Laurent Destailleur	15a40f6401	Fix default value of entity	2016-08-11 15:50:18 +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	f1ee2bdddf	Remove deprecated field	2016-08-09 13:10:34 +02:00
BENKE Charlie	432fad6ed7	Update 4.0.0-5.0.0.sql	2016-08-07 14:22:05 +02:00
Juanjo Menent	28efc3e50f	NEW Add Panama datas	2016-08-03 09:45:12 +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	e0c232548e	Fix theme crazy after migration	2016-08-01 10:55:41 +02:00
Laurent Destailleur	246321cd8f	Fix clean orphelins of leave request logs in repair tools Fix date of supplier proposal missing.	2016-07-30 18:08:07 +02:00
Regis Houssin	4b8f42949c	# WARNING: head commit changed in the meantime Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670	2016-07-25 21:05:11 +02:00
Marcos García de La Fuente	b1c552ee9d	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/install/mysql/tables/llx_product_attribute.key.sql # htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql	2016-07-24 11:54:38 +02:00
Marcos García de La Fuente	c082505021	NEW Added product attributes feature	2016-07-24 11:27:52 +02:00
Laurent Destailleur	9c89bc4095	Remove deprecated tables and code	2016-07-23 10:57:27 +02:00
Laurent Destailleur	b90ed8d677	Merge pull request #5375 from frederic34/charges NEW select bank and payment mode for social contrib	2016-07-20 19:00:10 +02:00
Laurent Destailleur	9ba1ca5acb	Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 Conflicts: htdocs/langs/en_US/companies.lang	2016-07-15 17:05:12 +02:00
Laurent Destailleur	00d80d827f	To match new standard, next version will be called 5.0, 6.0, ...	2016-07-15 11:17:33 +02:00
Laurent Destailleur	f758f3466e	Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card NEW : select default bank account on thirdparty card	2016-07-15 11:16:17 +02:00
frederic34	2de3d4ec7b	Merge remote branch 'upstream/develop' into charges Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-07-15 10:41:56 +02:00
Laurent Destailleur	74f28b3861	NEW Complete table llx_ecm_files with field generated_or_uploaded	2016-07-15 10:38:13 +02:00
Laurent Destailleur	eb47ec5823	Drop another deprecated table llx_ecm_documents (replace by llx_ecm_files)	2016-07-15 10:27:20 +02:00
Laurent Destailleur	09306ba974	Drop not used table llx_document_generator (list of generators must be managed by submodules like are the templates of document or engines to select emailing targets (scan of a dedicated dir)	2016-07-15 10:23:36 +02:00
frederic34	7e3978c403	sql changes	2016-07-15 10:04:04 +02:00
Laurent Destailleur	ec6640af63	Add field virtualhost for website module	2016-07-14 15:54:46 +02:00
Laurent Destailleur	a258663175	Fix edition of status were loosing old percent. We show it to allow user to keep it if required.	2016-07-09 14:58:51 +02:00
Laurent Destailleur	d940cc392a	FIX Several fix to exclude WON/LOST of reporting of opportunities amount (sometimes we need, sometimes not).	2016-07-08 10:59:13 +02:00
Regis Houssin	08725003b9	Fix: add entity field in llx_societe_remise, useful when third-sharing is used with multicompany	2016-07-07 12:43:02 +02:00
Regis Houssin	ee02ff43d7	Fix: add entity field in llx_societe_remise_except, useful when third-sharing is used with multicompany	2016-07-07 12:26:30 +02:00
Sof	9b5bcc6dcd	FIX: Missing semicolon	2016-07-07 10:25:17 +02:00
Regis Houssin	25631b236b	Fix: missing rename field "shortname" to "ref"	2016-06-23 16:47:21 +02:00
Laurent Destailleur	8356dd1080	Fix minor	2016-06-20 10:22:08 +02:00
Raphaël Doursenaud	eb54c3f8af	Fix #5350 date_pointoftax prevented creating invoices	2016-06-16 13:09:11 +02:00
Maxime Kohlhaas	f51386c59f	FIX #5343	2016-06-15 08:06:22 +02:00
Laurent Destailleur	47308d27c3	Missing column import_key and import for vat payments	2016-06-06 14:37:06 +02:00
Laurent Destailleur	681249de8a	Debug module resource	2016-06-06 12:29:15 +02:00
Laurent Destailleur	b57476153f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/admin/menus/edit.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/societe/consumption.php	2016-06-04 01:14:36 +02:00
Maxime Kohlhaas	f2e4fdcce4	Fix import model not correctly saved #5185	2016-06-04 00:16:01 +02:00
Maxime Kohlhaas	8901b99e2d	Fix import model not correctly saved #5185	2016-06-04 00:14:08 +02:00
gauthier	ab06ffda58	NEW : select default bank account on thirdparty card	2016-06-03 15:43:05 +02:00
Laurent Destailleur	537c9637f6	Merge pull request #5255 from atm-florian/dev_fix5151 FIX: #5151	2016-06-02 10:05:02 +02:00
Laurent Destailleur	7519c4a602	FIX Log of tax FIX Missing import key on social contributions and missing class to manage type of social contributions.	2016-06-01 13:24:27 +02:00
Florian HENRY	d17a879f33	add into migratino script	2016-05-31 23:32:21 +02:00
Laurent Destailleur	3ddf427ff1	FIX Legal issue for GB. Add hidden option for this.	2016-05-30 00:52:16 +02:00
Laurent Destailleur	db56e1b8a1	FIX Missing columns in migration	2016-05-26 21:17:43 +02:00
Laurent Destailleur	f398174772	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/auguria_menu.php htdocs/core/menus/standard/eldy.lib.php	2016-05-22 19:34:27 +02:00
Laurent Destailleur	db432e2cc4	Fix lot number	2016-05-21 18:12:03 +02:00
Laurent Destailleur	b95981a2be	Fix missing ; at end of sql	2016-05-21 18:03:13 +02:00
Sof	da2c9a0f74	Syntax error : bad name of field	2016-05-19 17:42:57 +02:00
Laurent Destailleur	a36b780c53	Fix phpunit	2016-05-17 20:30:04 +02:00
Laurent Destailleur	be251cd2b0	Add high risk sql at end	2016-05-17 18:22:48 +02:00
Laurent Destailleur	d083ad9382	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/product/class/product.class.php htdocs/resource/class/html.formresource.class.php	2016-05-17 18:21:22 +02:00
Laurent Destailleur	79be93d998	FIX The table llx_product_lot is now filled/used to store eatby/sellby dates.	2016-05-17 18:19:36 +02:00
Laurent Destailleur	3b99fb01ee	Fix duplicate table	2016-05-17 10:51:03 +02:00
Laurent Destailleur	63d0710842	FIX Creation of the second ressource type fails.	2016-05-17 10:44:30 +02:00
Laurent Destailleur	05cbfbb38f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/install/mysql/migration/repair.sql	2016-05-17 01:19:49 +02:00
Laurent Destailleur	95ea20eb44	Clean code for stock movement when lot are used. We should not get duplicate records into llx_product_batch	2016-05-17 01:10:11 +02:00
Laurent Destailleur	75b4c61fbc	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/contrat/card.php	2016-05-17 00:02:54 +02:00
Laurent Destailleur	94c532dd8a	Clean splitted lines into llx_product_batch	2016-05-16 23:58:06 +02:00
Laurent Destailleur	929787006e	Clean data	2016-05-16 22:40:29 +02:00
Ion Agorria	9b11907c70	Update existing linked elements to new type	2016-05-11 18:50:25 +02:00
Laurent Destailleur	6bb269381a	Merge pull request #5143 from frederic34/morecateg categories account like other categories	2016-05-07 20:25:17 +02:00
Laurent Destailleur	82745d32df	NEW Survey system has now a status like other objects. You can close or reopen a survey.	2016-05-07 17:12:31 +02:00
Laurent Destailleur	cdbbe8d87b	Minor fixes	2016-05-05 23:44:44 +02:00
Laurent Destailleur	1f23909899	Merge pull request #5146 from aspangaro/4.0-p26 NEW: Accountancy - Prepare multiple journals	2016-05-05 22:46:36 +02:00
Laurent Destailleur	7e34581952	Merge pull request #5139 from aspangaro/4.0-p25 FIX: Accountancy - Chart of accounts are limited on only one country	2016-05-05 22:27:05 +02:00
Laurent Destailleur	d69904c14d	Can set the home page of web sites	2016-05-02 15:51:18 +02:00
aspangaro	88435a0d80	NEW: Accountancy - Prepare multiple journals	2016-05-01 08:03:40 +02:00
frederic34	17463b4927	categories account like other categories	2016-04-30 14:45:24 +02:00
aspangaro	7041a041ce	FIX: Accountancy - Chart of accounts are limited on only one country	2016-04-30 06:52:21 +02:00
Laurent Destailleur	19162fc8d5	Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into PeartreeG-patch-1 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/resource/element_resource.php	2016-04-29 18:31:11 +02:00
Juanjo Menent	5ca989c836	Merge pull request #5126 from FHenry/dev_fixpgsql FIX Postgres migration from 3.9 to 4.0	2016-04-29 12:18:49 +02:00
Juanjo Menent	d6b1cd8a1c	Merge pull request #5083 from aspangaro/4.0-p22 FIX: Accountancy - Work on categories for report - Add french example & other	2016-04-29 11:59:41 +02:00
Florian HENRY	e698c410f5	FIX Postgres migration from 3.9 to 4.0	2016-04-28 13:56:17 +02:00
Laurent Destailleur	e723966583	FIX: Qty in stock must be float like it is in stock movement. FIX: Can't create a stock transfer from product card Performance enhancement of stock information loading.	2016-04-28 11:01:56 +02:00
Laurent Destailleur	66ea799eb7	Uniformize code and add more comment to understand workflow	2016-04-26 13:27:32 +02:00
aspangaro	04fd5a20ef	FIX: Accountancy Work on categories for Report - Add french example	2016-04-23 15:43:28 +02:00
Laurent Destailleur	7e047ada2b	Merge pull request #5064 from aspangaro/4.0-p21 FIX: Accountancy - Road to stable version	2016-04-22 19:21:18 +02:00
aspangaro	4a078db060	FIX: Migration script	2016-04-22 06:57:37 +02:00
Frédéric FRANCE	adde434708	Update 3.9.0-4.0.0.sql	2016-04-21 08:52:10 +02:00
Laurent Destailleur	d9e846e586	Update migrate script	2016-04-21 02:47:34 +02:00
Laurent Destailleur	349c1c2d69	Merge pull request #4999 from fappels/develop Fix migration script	2016-04-19 19:22:37 +02:00
Laurent Destailleur	4619040983	Work on website module	2016-04-19 18:41:05 +02:00
Laurent Destailleur	3a807d9cdb	Revert a commit. The field was already added.	2016-04-18 21:07:26 +02:00
Laurent Destailleur	a88b3a8cc4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-18 21:02:34 +02:00
Laurent Destailleur	f68f5677bb	Start to use the vat code to identify a vat into combo list instead of just "rate" and "npr".	2016-04-18 21:02:14 +02:00
Juanjo Menent	5a87218622	Merge pull request #5034 from aspangaro/4.0-p19 NEW: Accountancy - Add Result page	2016-04-18 20:17:27 +02:00
Frédéric FRANCE	c6226e63b7	Update 3.9.0-4.0.0.sql	2016-04-18 08:13:01 +02:00
aspangaro	b59c94e056	NEW: Accountancy - Add Result page & review	2016-04-17 15:44:04 +02:00
Juanjo Menent	f86952dfaa	FIX Add missing field fk_shipping_method_id	2016-04-15 16:57:11 +02:00
fappels	2462716eb4	Fix migration script	2016-04-12 16:24:00 +02:00
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +02:00
Laurent Destailleur	27217ccccd	Maxi debug of supplier order workflow. Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED Parameter user is added so it is defined into triggers.	2016-04-09 18:51:09 +02:00
Laurent Destailleur	874c65dfda	Fix unique key of table	2016-04-09 10:13:56 +02:00
Laurent Destailleur	7b16482cee	Add comment to show directoves to solve conception error on lot management (add a table to store all lots and their properties: date, note, ...) Removed deprecated field pmp at stock level (pmp is at product level)	2016-04-09 10:01:22 +02:00
Laurent Destailleur	448758bbf4	Merge branch 'develop_NEW_supplier_price_reputation' of https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_supplier_price_reputation Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-04-08 22:01:55 +02:00
Laurent Destailleur	010a4f8929	Merge pull request #4945 from frederic34/shipcust NEW : Select Preferred Sending Method for a third party	2016-04-08 21:31:06 +02:00
Laurent Destailleur	f14b03a230	NEW Add more trackable events (create, submit and receive supplier order). So we will be able to use generic features to log what was done with the specific table llx_commande_fournisseur_log	2016-04-08 17:07:25 +02:00
Alexis Algoud	c2a5ad7d9c	FIX sql	2016-04-06 10:05:03 +02:00
Laurent Destailleur	3738dae38d	NEW Add date_rum into table of thirdparty bank account.	2016-04-05 12:06:47 +02:00
Laurent Destailleur	0f0850664d	FIX Remove duplicates of shipment modes	2016-04-05 11:47:52 +02:00
frederic34	198b9ce8fe	Select Preferred Sending Method for a customer	2016-04-04 18:28:55 +02:00
Juanjo Menent	b3a5c8bae2	Merge pull request #4937 from simnandez/dolibarr-3510 Close #3510 Add a numbering module for check deposits	2016-04-03 16:22:34 +02:00
Juanjo Menent	8f2fb64efb	Merge pull request #4929 from aspangaro/4.0-p12 FIX: Problem with dolibarr installation/migration script. Range is a reserved name...	2016-04-03 16:20:31 +02:00
Juanjo Menent	cd6c6f64c5	Merge remote-tracking branch 'upstream/develop' into dolibarr-3510 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-04-03 12:41:14 +02:00
Juanjo Menent	d55d12baeb	NEW #3510 : Working	2016-04-03 11:56:31 +02:00
aspangaro	0c5f504881	FIX: Accountancy - Correct the display of account_parent	2016-04-02 06:22:31 +02:00
aspangaro	1df1e775ee	Space2	2016-04-01 06:49:24 +02:00
aspangaro	84d326e036	FIX: Problem with dolibarr installation/migration script. Range is a reserved name.	2016-04-01 06:41:49 +02:00
Laurent Destailleur	a15a46449c	Merge pull request #4910 from aspangaro/4.0-p11 NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)	2016-03-30 14:00:50 +02:00
aspangaro	9cac252641	NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)	2016-03-30 06:54:28 +02:00
aspangaro	c9271e04a0	Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-03-29 19:54:41 +02:00
aspangaro	8acf39cbb1	Uniformize name of table	2016-03-28 13:58:14 +02:00
aspangaro	432cc44ab6	NEW: Accountancy - Add category	2016-03-28 13:51:19 +02:00
aspangaro	85d51b0d6f	Correct of problem of merging with my last commits	2016-03-28 07:46:55 +02:00
Laurent Destailleur	22bed60a07	Remove manually other PR that should not be validated (travis errors reported on PR with serious mysql error in migration due to use of reserved keyword "range" as a name of a field).	2016-03-26 11:19:45 +01:00
aspangaro	1d780e7e77	NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-03-25 15:59:31 +01:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
aspangaro	252f37b363	NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet	2016-03-23 21:36:52 +01:00
aspangaro	72abdde912	Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report	2016-03-22 12:57:45 +01:00
Laurent Destailleur	7dac7c4f04	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-11 11:00:53 +01:00
Laurent Destailleur	7a5353efb2	Make things clearer about option MAIN_ENABLE_LOG_TO_HTML	2016-03-10 18:36:09 +01:00
Laurent Destailleur	2e1a63a1f3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/langs/de_DE/companies.lang htdocs/langs/fr_FR/compta.lang htdocs/societe/class/societe.class.php htdocs/societe/commerciaux.php htdocs/societe/consumption.php	2016-03-10 15:09:30 +01:00
Laurent Destailleur	3b035819a9	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php htdocs/product/document.php htdocs/societe/commerciaux.php	2016-03-10 15:03:53 +01:00
Laurent Destailleur	f742d4ec66	Fix code corrupting database	2016-03-10 13:46:52 +01:00
Laurent Destailleur	80805f78ea	Disable too dangerous patch. Fix must be done by doing an insert only without creating/renaming databases.	2016-03-10 13:43:09 +01:00
Florian HENRY	b58e155a6f	FIX : #4785	2016-03-10 12:22:49 +01:00
Florian HENRY	6138da8db6	Extend element type of action comm (for long name external modules)	2016-03-10 11:39:26 +01:00
Laurent Destailleur	09a29322c3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php htdocs/commande/orderstoinvoice.php htdocs/public/demo/index.php htdocs/societe/commerciaux.php	2016-03-08 17:40:21 +01:00
Florian HENRY	4bf2da4af7	revert SQL changes	2016-03-08 10:24:59 +01:00
Laurent Destailleur	e7511dd267	Fix consistency into data for time spent on tasks	2016-03-04 14:27:05 +01:00
Regis Houssin	25686e82c9	Fix: best compatibility with multicompany and others security issue	2016-03-03 08:49:24 +01:00
Laurent Destailleur	3a58613e45	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/bookkeeping/listbyyear.php htdocs/accountancy/journal/bankjournal.php htdocs/compta/facture/list.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/projet/activity/index.php	2016-03-02 23:40:11 +01:00
Frédéric FRANCE	222ce45e0c	Update 3.9.0-4.0.0.sql	2016-03-02 18:57:34 +01:00
Juanjo Menent	486488795a	FIX : Remove bad migration file for this version	2016-02-27 09:44:48 +01:00
Juanjo Menent	77173344fe	NEW : Add Malta VAT into 3.9	2016-02-27 09:36:09 +01:00
Juanjo Menent	27b86be62b	Remove from 4.0	2016-02-27 09:29:28 +01:00
Juanjo Menent	673cf602e9	NEW Added Malta VAT into migration script	2016-02-26 20:12:39 +01:00
Laurent Destailleur	1fa94e4d6a	NEW Introduce position of records into dictionnary of type of contacts	2016-02-26 15:03:07 +01:00
Laurent Destailleur	715b2024cd	Better repair script	2016-02-24 17:17:41 +01:00
Laurent Destailleur	371dec8503	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/langs/en_US/products.lang htdocs/langs/fr_FR/companies.lang	2016-02-24 12:13:12 +01:00
Juanjo Menent	6db0f01fa4	FIX : Bad Argentina provences	2016-02-22 19:53:39 +01:00
Laurent Destailleur	ff9a82c96f	Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment New add multicurrency supplier invoice payment	2016-02-22 16:26:31 +01:00
Laurent Destailleur	f759f26db9	Fix travis error	2016-02-22 16:20:21 +01:00
phf	fd4cda819c	New add supplier payment	2016-02-21 22:47:52 +01:00
Benoît Peccatte	c969b09ef7	Add support to product translation imports	2016-02-21 22:04:47 +01:00
Laurent Destailleur	351ce6228d	NEW Add width and height on product card	2016-02-20 04:49:02 +01:00
Laurent Destailleur	277d92af75	Secure migration for people using a RC	2016-02-20 03:14:29 +01:00
BENKE Charlie	d96c89afa1	Update 3.9.0-4.0.0.sql	2016-02-19 15:55:59 +01:00
Laurent Destailleur	9c8d69eaa9	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-02-19 04:46:11 +01:00
Laurent Destailleur	4d0b9946f5	FIX Maxi serious problem when updating prices and vat of a product. All mode (one price, price per level, ...) were impacted. Localtax setup were lost.	2016-02-19 02:41:00 +01:00
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
Laurent Destailleur	9d418bca7f	Merge branch 'new_add_customer_multicurrency_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_add_customer_multicurrency_payment Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-16 15:06:39 +01:00
Laurent Destailleur	8fb0f8d9d1	Merge branch 'patch-100' of https://github.com/defrance/dolibarr into defrance-patch-100 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/user/card.php	2016-02-16 13:54:56 +01:00
phf	86c8998742	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 20:53:06 +01:00
Laurent Destailleur	9cbbf07351	Add fields to link recurring invoice lines with contract origin when it comes from this.	2016-02-15 16:13:33 +01:00
Laurent Destailleur	d4c3258385	Fix missing field Fix bad value for default value of next date	2016-02-15 07:36:45 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	e8bc88fffe	Merge branch 'new_recurring_invoice' of https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:45:39 +01:00
Laurent Destailleur	71a12824c9	Merge branch 'new_numbering_module_supplier_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_numbering_module_supplier_payment Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:31:33 +01:00
BENKE Charlie	23cb0d437c	Update 3.9.0-4.0.0.sql	2016-02-13 10:53:01 +01:00
phf	c4812abd62	Fix can update fields of facture rec Fix create invoice from facture rec don't get all properties and add fk_account	2016-02-12 12:31:43 +01:00
Frédéric FRANCE	ad534c90e6	Update 3.8.0-3.9.0.sql	2016-02-12 10:34:21 +01:00
phf	875e01aeee	New add recurrence fields on create form of invoice model Fix missing fields in database about multicurrency	2016-02-11 09:50:35 +01:00
phf	a0cfe9aad8	New add payment with multicurrency module	2016-02-10 23:16:38 +01:00
Florian HENRY	23e35a6012	update size of elementtype column into llx_actioncomm (module_subelement name can be longer than 32)	2016-02-10 14:21:57 +01:00
Laurent Destailleur	fcf1e20d5b	Merge pull request #4578 from frederic34/sticker Dictionnary for label sticker and card format	2016-02-08 14:49:31 +01:00
Laurent Destailleur	d2708a4225	Merge pull request #4475 from atm-ph/new_multicurrency_module New multicurrency module	2016-02-08 14:44:49 +01:00

... 13 14 15 16 17 ...

2789 Commits