3563 Commits

Author	SHA1	Message	Date
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 García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	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 García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
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 García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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
phf	d66bc6f1b3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-02-06 12:57:30 +01:00
frederic34	0d11d94234	Merge remote branch 'upstream/develop' into sticker ... Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-06 12:12:35 +01:00
frederic34	9c74af63af	Dictionnary for label sticker and card format	2016-02-06 12:06:05 +01:00
phf	a8e480e392	FIX #3509 payment ref for suppliers	2016-02-04 23:15:06 +01:00
phf	75c4888364	NEW feature hidden extrafields	2016-02-03 22:49:43 +01:00
phf	1b552a0b3b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module ... Conflicts: htdocs/core/class/link.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-03 18:30:59 +01:00
PeartreeG	b0579cc39b	Update 3.9.0-4.0.0.sql	2016-02-02 18:05:00 +01:00
Laurent Destailleur	1fb1da5be4	Work on website module	2016-02-02 16:24:12 +01:00
Laurent Destailleur	f28d8669d9	Fix: no change of data ref.	2016-02-02 14:43:19 +01:00
abcnet-lu	a196e163e0	[Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix spaces)	2016-02-02 09:32:38 +01:00
abcnet-lu	755758dd7a	[Close] [#4555] Update label of intermediary VAT rate for Luxembourg	2016-02-02 09:28:45 +01:00
bosseal	fb7e1adad7	[Close] [#4553] Update VAT rates for Luxembourg (as they changed in 2015)	2016-02-02 08:23:46 +01:00
PeartreeG	ceb1cd5798	Update 3.9.0-4.0.0.sql	2016-01-31 18:16:53 +01:00
PeartreeG	e2404b57b3	adding additionnal fields for tracking resource use	2016-01-31 18:15:11 +01:00
Laurent Destailleur	928336c835	NEW Clean and enhance code for cron engine	2016-01-31 15:14:50 +01:00
PeartreeG	1fbfdbfefd	add new ressources fields	2016-01-31 12:47:18 +01:00
Laurent Destailleur	7c2ac4b3ee	NEW The probability of lead/opportunity can be defined per lead.	2016-01-28 20:04:02 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
phf	2d4f355792	FIX back quote into migration sql file	2016-01-21 21:57:09 +01:00
phf	f7afbcff68	NEW integration of multicurrency module (creation fields in database and admin) ... NEW add multicurrency_code on create, update and fetch company object NEW add multicurrency on propal FIX travis FIX back quote into sql file	2016-01-21 21:38:52 +01:00
aspangaro	84ff86ab50	Merge remote-tracking branch 'Upstream/develop' into develop-p3	2016-01-21 20:53:42 +01:00
aspangaro	ddc2e8bfbe	Fix: Modify length of code journal for accountancy in bank account	2016-01-21 20:52:15 +01:00
Laurent Destailleur	4dc812618a	NEW Add index on invoice status ... NEW Add constant MAIN_LOGTOHTML to 0 into other setup by default to save time when we need to make debug on hosted instance.	2016-01-21 10:37:43 +01:00
Laurent Destailleur	6bccac5691	NEW Add Expense report to approve into workboard ... NEW Selection of boxes is move on top	2016-01-18 11:35:45 +01:00
Laurent Destailleur	4a009d2ad2	NEW On translation admin page, admin can overwrite a translation value.	2016-01-16 00:48:14 +01:00
Laurent Destailleur	03eccb3336	Prepare database to be able to manage a different opportunity ... probability for each opportunity.	2016-01-10 19:48:59 +01:00
Juanjo Menent	9c0b6ff5a4	Fix: Move table interventions modify from 3.9 to 4.0	2016-01-09 18:08:55 +01:00
Juanjo Menent	66c5d7c9ce	Merge pull request #4150 from defrance/patch-84 ... Add date start and end of intervention	2016-01-09 17:56:39 +01:00
Laurent Destailleur	cbe65fbc79	Fix: fields added into 3.8 to store email event was not enough. To late ... to use them. Will be done into 4.0	2016-01-08 13:05:56 +01:00
Laurent Destailleur	5a49b8ce53	Fix: error when running install twice ... Fix: a minor error was locking the full upgrade process.	2015-12-31 12:02:22 +01:00
bobby	e557c002c8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-26 11:56:10 +01:00
Laurent Destailleur	8c1f271356	Maxi debug of module leave requests.	2015-12-24 12:37:38 +01:00
Florian HENRY	8006baf592	ry	2015-12-21 13:09:22 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
cla	ef487c48a4	NEW ... Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
aspangaro	5cd5413836	Accountancy add a column in table bookkeeping to validate operations	2015-12-16 05:22:50 +01:00
BENKE Charlie	3e8c670e84	Update 3.8.0-3.9.0.sql	2015-12-15 11:46:20 +01:00
Laurent Destailleur	3b595f0247	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/customer/list.php htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/date.lib.php htdocs/core/lib/report.lib.php htdocs/langs/en_US/accountancy.lang	2015-12-13 16:23:33 +01:00
Laurent Destailleur	a462cd232d	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 16:09:09 +01:00
Laurent Destailleur	4a88c9ea9f	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/product/class/product.class.php	2015-12-13 15:53:57 +01:00
Laurent Destailleur	5f4be14dd2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-12 13:19:55 +01:00
Laurent Destailleur	47fce16778	Merge branch 'develop' of https://github.com/FHenry/dolibarr into ... FHenry-develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-12-11 17:04:19 +01:00
Andreas Pachler	019bc7ba8e	added austrian Regions, Departements, Forme Juridique and social charges to migration file from 3.8 to 3.9	2015-12-10 12:56:05 +01:00
Raphaël Doursenaud	c0862762a5	Fix #3930 Removed executable bit ... These files doesn't contain executable code and may pose a security threat.	2015-12-09 13:28:36 +01:00
Florian HENRY	96a95d6ae1	Debug accountancy on 3.9	2015-12-09 12:55:08 +01:00
Laurent Destailleur	984068c136	Fix length of password too low (password was truncated making them ... inoperent)	2015-12-06 19:17:39 +01:00
BENKE Charlie	1da6b06605	Update 3.8.0-3.9.0.sql	2015-12-04 13:23:13 +01:00
aspangaro	c30728326e	Merge remote-tracking branch 'Upstream/develop' into develop-bank	2015-12-04 12:41:51 +01:00
BENKE Charlie	46aaf9c270	Update 3.8.0-3.9.0.sql	2015-12-04 12:34:17 +01:00
Laurent Destailleur	055e650adf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-02 23:23:38 +01:00
aspangaro	882b66c586	HRM - Add bank tab in user to pay salary or expense report	2015-12-01 06:56:26 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Laurent Destailleur	c55d11869b	Billing of supplier or customer order is a process that can be done in ... parallel with shipment or reception, so we show the status on another field into lists.	2015-11-29 15:54:32 +01:00
Laurent Destailleur	9db71098ac	Merge pull request #4031 from FHenry/develop ... PG SQL	2015-11-21 01:50:47 +01:00
Laurent Destailleur	a906774595	Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order ... NEW 3.9 add billed status for supplier order	2015-11-21 00:20:17 +01:00
Laurent Destailleur	401b2a7389	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/theme/md/style.css.php	2015-11-20 23:47:07 +01:00
Florian HENRY	fbe8a181a9	fix pgsql	2015-11-18 14:03:25 +01:00
Laurent Destailleur	735c7b7d68	Code comment	2015-11-18 13:57:01 +01:00
Florian HENRY	0ffc2a226c	fix pg migration script	2015-11-18 13:53:04 +01:00
Laurent Destailleur	b1c5768de9	NEW Add fields into llx_cronjobs to be able to use job table to queue ... one shot jobs.	2015-11-17 18:22:39 +01:00
Laurent Destailleur	6dc6bab556	Support of 'small', 'mini' and '' image size everywhere.	2015-11-17 10:38:00 +01:00
Laurent Destailleur	86db029cb3	Merge pull request #4013 from fappels/develop ... Fix migration - remove default for text field	2015-11-17 10:06:07 +01:00
fappels	e9be3d19f4	Fix migration - remove default for text field ... remove default for user_param value text field lang typo	2015-11-16 21:24:08 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
fmarcet	9e51cf66dd	New: Bolivian regions and departmens	2015-11-16 12:34:59 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to ... do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to ... suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Frédéric FRANCE	bab41e40e7	Update 3.8.0-3.9.0.sql	2015-11-12 17:50:52 +01:00
aspangaro	05b0ab2eab	HRM: Add fk_establishment in llx_user to link an user to an establishment	2015-11-11 15:45:55 +01:00
Laurent Destailleur	f49fab8a7e	Rename some files in english and increase fields size.	2015-11-09 16:48:30 +01:00
Laurent Destailleur	bd56396394	Fix migration error	2015-11-08 15:38:57 +01:00
Laurent Destailleur	fa8863d2ea	Fix sql migration requests	2015-11-08 01:38:03 +01:00
Florian HENRY	a4fafae109	FIX : Remove column creation for table llx_product_fournisseur_price, ... the column use un calss is fk_supplier_price_expression, and fk_price_expression does not exist into lx_product_fournisseur_price sql file declaration	2015-11-07 17:19:13 +01:00
Laurent Destailleur	09fb87e47d	Prepare tables for categories/tags on projects. Looking for a dev to ... implement categories/tags on projects !	2015-11-07 11:40:31 +01:00
Laurent Destailleur	b2d9f21253	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-06 18:57:46 +01:00
Florian HENRY	28b229c83a	FIX: #3916	2015-11-06 11:24:52 +01:00
Laurent Destailleur	11f0cad2ab	FIX #3912	2015-11-06 11:22:50 +01:00
Florian HENRY	d3d62f7db5	FIX: #3913	2015-11-06 11:11:23 +01:00
Florian HENRY	b0be2b04c7	FIX : #3912	2015-11-06 10:53:33 +01:00
Florian HENRY	f6b8c3a130	FIX : #3912	2015-11-06 10:50:08 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
Laurent Destailleur	81f0b516b9	Prepare module opensurvey for 'Form' type.	2015-11-04 11:08:46 +01:00
Laurent Destailleur	826cc6db1b	Repair old deprecated data	2015-11-04 09:54:13 +01:00
Laurent Destailleur	8f2fb3cbee	Merge pull request #3845 from frederic34/patch-19 ... Remove incomplete llx_stock_lotserial migration	2015-11-02 10:43:55 +01:00
Juanjo Menent	a58b5f26f6	Merge pull request #3774 from marcosgdf/multiprice-generator ... NEW Level multiprice generator based on per cent variations over base price	2015-10-31 23:03:19 +01:00
Marcos García de La Fuente	592348850f	Added missing SQL statements + reordered them	2015-10-31 11:48:17 +01:00
Marcos García de La Fuente	e1f2efee4d	Merge branch 'develop' into multiprice-generator ... # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-31 11:46:14 +01:00
Frédéric FRANCE	f3f83fa6c1	Remove incomplete llx_stock_lotserial migration ... There is two creation of this table in migration script, keeping the more complete	2015-10-31 10:32:41 +01:00
Frédéric FRANCE	4108f55c1e	Update 3.8.0-3.9.0.sql	2015-10-31 10:07:13 +01:00
Maxime Kohlhaas	59714e4b32	Fix : migration wrong index	2015-10-30 12:41:36 +01:00
Laurent Destailleur	6cc3df7e71	NEW Quick searh filter works on invoice, proposal, order, intervention, ... contract	2015-10-30 08:35:56 +01:00
Laurent Destailleur	2b5746aec3	Add field position into some dictionaries tables	2015-10-29 21:25:18 +01:00
Laurent Destailleur	282972784e	Prepare table for budget lines	2015-10-29 19:18:41 +01:00
Laurent Destailleur	8f52d426d0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-28 22:08:28 +01:00
Laurent Destailleur	8c84ce1576	Create table llx_stock_serial. This table may be used to store eatby and ... sellby date for a couple product-batch number in one place only.	2015-10-28 22:05:37 +01:00
Marcos García de La Fuente	eff1f73950	Merge branch 'develop' into multiprice-generator ... # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql # htdocs/product/price.php	2015-10-27 10:41:50 +01:00
aspangaro	b90c56fbb5	HRM : move migration into 3.8 to 3.9	2015-10-27 06:29:18 +01:00
Laurent Destailleur	07b277b23f	Prepare fields in dtabase to store if time spent was invoiced or not.	2015-10-26 15:22:33 +01:00
Laurent Destailleur	016dbd39ee	Fix sql phpunit regression	2015-10-23 15:24:47 +02:00
Laurent Destailleur	633055fe5b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 19:44:00 +02:00
Laurent Destailleur	1000fd1b21	Add field employee for hr module	2015-10-22 19:43:50 +02:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm ... New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	cac4a85ccd	Merge pull request #3788 from atm-maxime/new_customer_recap ... New customer recap	2015-10-22 18:02:38 +02:00
Laurent Destailleur	3d7050e051	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 12:29:35 +02:00
Laurent Destailleur	9cbb9129c2	FIX #3772	2015-10-22 12:29:24 +02:00
Laurent Destailleur	ce681081c1	Merge pull request #3776 from frederic34/patch-15 ... Set warehouse for order	2015-10-22 12:16:40 +02:00
Laurent Destailleur	40adaf716d	Uniformize index names	2015-10-22 10:33:42 +02:00
Laurent Destailleur	4453ba53fd	Fix migration error	2015-10-22 10:28:59 +02:00
Frédéric FRANCE	6a524eeabb	Update 3.8.0-3.9.0.sql	2015-10-19 21:04:05 +02:00
Maxime Kohlhaas	a953a66616	New : allow to define list size for object list on customer card	2015-10-19 19:05:04 +02:00
Laurent Destailleur	ec04306348	Fix #3772 Test lower value to avoid mysql limit	2015-10-19 18:31:38 +02:00
Marcos García de La Fuente	e7e152c122	NEW Level multiprice generator based on per cent variations over base price	2015-10-19 15:13:19 +02:00
Laurent Destailleur	dcf7d344cd	Prepare database for future portal website	2015-10-19 12:54:22 +02:00
Laurent Destailleur	b9001d7ab8	NEW Prepare database to store information per files (for example to ... define if an image ca, be used as a cover or not)	2015-10-18 22:43:19 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm ... Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	91a2341e88	Add missing column	2015-10-17 03:32:19 +02:00
Laurent Destailleur	e2478eea07	NEW Increase length of bank code to 128 char #3704	2015-10-15 12:18:17 +02:00
Laurent Destailleur	7f75a3da9d	NEW On list of thirdparties, user can select fields to show. ... Make phpunit test working again localy. Add missing columns into llx_expedition.	2015-10-15 03:29:35 +02:00
Laurent Destailleur	e9aed15bed	Work on the feature to select which field to show	2015-10-14 18:48:03 +02:00
aspangaro	8b97196c2f	Correct term status & sql error	2015-10-10 08:50:55 +02:00
aspangaro	5d7e05e313	Correct review	2015-10-10 06:00:55 +02:00
aspangaro	bde7279aa1	Review by Rdoursenaud. Tkanks	2015-10-09 13:00:51 +02:00
aspangaro	b571cc86ff	Add a yn form in user card to know if the user is also an employee	2015-10-09 07:30:48 +02:00
aspangaro	6a7892ca52	Add the first tables	2015-10-09 06:41:36 +02:00
frederic34	7f86797f73	Add contact photo	2015-10-04 17:25:46 +02:00
Juanjo Menent	67d28d6991	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-03 14:59:56 +02:00
Laurent Destailleur	53269a2703	Removed old theme with no maintener.	2015-10-01 23:27:41 +02:00
Laurent Destailleur	fcf3a0966c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-01 23:19:58 +02:00
Laurent Destailleur	3f8b95de77	Work on default theme	2015-10-01 23:19:50 +02:00
Regis Houssin	259f7af3e6	Fix: missing llx_const encryption	2015-10-01 12:06:45 +02:00
Laurent Destailleur	c7e05d2473	Add field pass_crypted to uniformize fields between members and users.	2015-09-30 19:27:36 +02:00
Juanjo Menent	f14c806439	Merge branch 'develop' into dolibarr-3509 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-26 09:03:50 +02:00
Juanjo Menent	342e3413db	Issue 3509: Init works	2015-09-23 22:48:48 +02:00
aspangaro	918c323f8f	Salaries : Add info card / add field datec / rename field user_creat to user_author	2015-09-23 06:37:14 +02:00
Laurent Destailleur	81b447dd0f	NEW Add color on categories	2015-09-17 19:51:56 +02:00
Laurent Destailleur	b1168d223a	NEW Introduce table llx_overwrite_trans to be able to overwrite ... translations by simple database edition.	2015-09-17 18:44:42 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	e0a88fabd9	FIX #3521	2015-09-14 17:54:53 +02:00
Florian HENRY	6cb993c0b4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-10 11:20:03 +02:00
aspangaro	393d528be7	Merge remote-tracking branch 'Upstream/develop' into develop-64 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-08 21:17:54 +02:00
aspangaro	cf869f22b5	Merge remote-tracking branch 'Upstream/develop' into develop-63 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-07 21:45:13 +02:00
aspangaro	5780d33f9b	Merge remote-tracking branch 'Upstream/develop' into develop-64 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-06 22:00:52 +02:00
aspangaro	671018c5cc	New Accountancy Uniformize code & rename a constant	2015-09-06 21:53:28 +02:00
Laurent Destailleur	77ef046af4	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:02:21 +02:00
aspangaro	ef7df3f261	New: Accountancy rename llx_accountingaccount in llx_accounting_account ... Fix: language key	2015-09-05 08:03:06 +02:00
Laurent Destailleur	942723ff8d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-08-31 12:13:35 +02:00
aspangaro	e4bac2adfd	Merge remote-tracking branch 'Upstream/develop' into develop-57 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-08-30 07:39:45 +02:00
Laurent Destailleur	47ea834516	Fix debug module expense report	2015-08-28 20:11:16 +02:00
aspangaro	134bd42c4e	Increase length of column pcg_version to 32	2015-08-27 15:13:29 +02:00
Florian HENRY	3ae9515416	add column for import	2015-08-20 10:43:27 +02:00
Florian HENRY	b4e810a7a8	FIX: #3392	2015-08-17 13:05:54 +02:00
aspangaro	bd69d37c3a	New: Add number of expense reports to pay	2015-08-17 05:29:12 +02:00
Laurent Destailleur	daeada4bae	Merge branch 'patch-70' of https://github.com/defrance/dolibarr into ... defrance-patch-70 Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-08-12 22:12:50 +02:00
Laurent Destailleur	17f7b1528a	Fix not compatible not supported option	2015-07-28 10:05:48 +02:00
Juanjo Menent	16ae9633e5	FIX: Change Spanish provinces code to ISO	2015-07-22 11:26:20 +02:00
Juanjo Menent	7c8b1feaeb	FIX: Change Spanish provinces code to ISO	2015-07-22 10:57:25 +02:00
BENKE Charlie	b7e148d183	Update 3.7.0-3.8.0.sql	2015-07-14 02:49:58 +02:00
Laurent Destailleur	a9289de616	Several fixes. Fix #2927	2015-07-13 11:22:18 +02:00
Laurent Destailleur	312281f4d4	Debug askpricesupplier ... Try to continue work on position of menu entries.	2015-07-02 22:43:51 +02:00
Laurent Destailleur	276f057acf	Clean trigger codes ... Better error message when we insert duplicate barcode.	2015-06-30 16:10:03 +02:00
Laurent Destailleur	ae5b779652	Uniformize code	2015-06-30 01:34:17 +02:00
Laurent Destailleur	5f07c18e06	NEW Add opportunity amount on project card.	2015-06-29 16:57:32 +02:00
aspangaro	452733263d	Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT	2015-06-25 06:37:26 +02:00
aspangaro	385857380b	Remove old field	2015-06-23 06:39:55 +02:00
aspangaro	20582b9ea5	Merge remote-tracking branch 'Upstream/develop' into develop-36	2015-06-21 07:31:43 +02:00
Laurent Destailleur	4f1538f502	Introduce table llx_c_holiday_type	2015-06-21 03:19:15 +02:00
Laurent Destailleur	e0d1cbeb16	Introduce table llx_c_holiday_type	2015-06-21 00:07:03 +02:00
aspangaro	0ff97da1ea	Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT	2015-06-20 09:06:20 +02:00
aspangaro	50aa36502c	Merge remote-tracking branch 'Upstream/develop' into develop-32 ... Conflicts: htdocs/expensereport/card.php	2015-06-17 07:21:43 +02:00
aspangaro	8d0e7261f5	Debug	2015-06-17 07:19:25 +02:00
Laurent Destailleur	fb1a3f3ea3	Rename alternative name	2015-06-16 12:04:11 +02:00
aspangaro	a23994055a	Add field and table in database & migration script	2015-06-16 05:47:19 +02:00
Marcos García de La Fuente	a496606826	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/societe/soc.php	2015-06-13 02:45:42 +02:00
Laurent Destailleur	9b7982bf0c	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/fourn/facture/card.php htdocs/theme/eldy/style.css.php	2015-06-08 18:28:50 +02:00
Regis Houssin	de0dd5da60	Fix: Drop foreign key for avoid Mysql crash	2015-06-08 09:14:46 +02:00
aspangaro	67c9a95ffb	FIX: Correct migration script	2015-06-08 05:28:12 +02:00
Laurent Destailleur	b57f0a0e5f	Fix option to use old path for product is for compatibility if user come ... from 3.6 or lower. Must not be enabled on 3.7.0 or +.	2015-06-05 18:32:49 +02:00
Laurent Destailleur	43ed48896a	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-06-05 18:31:53 +02:00
Regis Houssin	e78dba809b	Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany ... Fix: use encrypt/decrypt with llx_const for experimental encryption of sensitive data	2015-06-05 09:42:21 +02:00
Laurent Destailleur	7c3f94d350	Merge pull request #2955 from hregis/develop_origin ... Fix: use encrypt/decrypt with llx_const for experimental encryption in	2015-06-05 09:35:25 +02:00
Laurent Destailleur	5edef2f02f	NEW A module can add its entries into cron module.	2015-06-05 03:32:09 +02:00
Regis Houssin	e1136b4758	Fix: use encrypt/decrypt with llx_const for experimental encryption in ... database of sensitive data	2015-06-04 15:50:31 +02:00
Laurent Destailleur	c9d63238ca	Add fields at bank account description to manage corretly sepa ... generation.	2015-06-01 13:19:02 +02:00
Laurent Destailleur	e9687cbc4f	Fix the amount for entry price must use the format dedicated to amount.	2015-05-31 18:23:11 +02:00
Laurent Destailleur	19694710b2	Keep this constant visible	2015-05-31 12:24:23 +02:00
Laurent Destailleur	7a0ec2d831	Prototype with datatables works now also ith jmobile. ... Add field fifo and lifo into product table.	2015-05-30 23:56:42 +02:00
Marcos García de La Fuente	460a2ec2ab	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/categories/categorie.php htdocs/comm/prospect/list.php	2015-05-25 15:09:46 +02:00
abb	4e48f24507	added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database	2015-05-23 15:12:24 +01:00
Raphaël Doursenaud	fc88df9ddf	Fixed typo	2015-05-21 16:33:38 +02:00
Raphaël Doursenaud	38a9f6edae	Drop deprecated fields ... Fix #2870	2015-05-21 16:32:46 +02:00
Laurent Destailleur	4a70bb7acf	Work on generic usage of get_exdir.	2015-05-18 23:04:49 +02:00
Laurent Destailleur	15c355efc9	A ref field must never be null.	2015-05-18 22:31:14 +02:00
Laurent Destailleur	36d164f779	Add field gender into table of user.	2015-05-17 23:43:57 +02:00
Laurent Destailleur	851007f1a8	Prepare database to manage recurring events	2015-05-17 20:12:49 +02:00
Juanjo Menent	1d3bcc1d81	Insert option to use old system storage photos only if the first ... installation was done with a version < 3.7.0 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-05-16 16:19:51 +02:00
Marcos García de La Fuente	e2b2c1c8bd	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/societe/class/societe.class.php	2015-05-15 12:30:03 +02:00
Laurent Destailleur	c33cbefad2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-15 11:16:29 +02:00
Laurent Destailleur	49a13f5e72	Debug of module expense report	2015-05-15 03:52:29 +02:00
Juanjo Menent	d65721bb20	Insert option to use old system storage photos only if the first ... installation was done with a version < 3.7.0	2015-05-13 20:34:57 +02:00
Laurent Destailleur	43b5209192	NEW Clean code into salary module, debug and add indexes ... NEW Can filter on user list and salary payments on user with naural search.	2015-05-13 08:57:39 +02:00
Laurent Destailleur	cb6f23d9b6	Merge pull request #2771 from aternatik/api_rest ... Add new core module : REST API	2015-05-12 19:39:37 +02:00
Laurent Destailleur	a94121a8c5	Add field to define picto to use for status	2015-05-12 09:42:14 +02:00
Marcos García de La Fuente	ce7ed70d74	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/prospect/list.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2015-05-10 12:23:07 +02:00
Laurent Destailleur	e6e263d13f	Add field to manage reccuring events	2015-05-06 16:44:41 +02:00
jfefe	24bf614061	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-05-06 01:00:11 +02:00
Laurent Destailleur	b0baed83fc	Prepare for email tracking	2015-05-05 21:50:48 +02:00
jfefe	4bce903c63	Add field into user table to store API key	2015-05-02 15:26:45 +02:00
Laurent Destailleur	53bf90a3e2	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog	2015-04-28 21:54:13 +02:00
Juanjo Menent	ebe1f4a74d	-Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old ... instances -Update changelog for 3.7.1 Conflicts: ChangeLog htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-04-27 20:31:12 +02:00
Juanjo Menent	93024830f5	-Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old ... instances -Update changelog for 3.7.1	2015-04-27 20:22:03 +02:00
Laurent Destailleur	414404e854	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/class/commonobject.class.php	2015-04-26 16:30:33 +02:00
Laurent Destailleur	025d8c2a71	Clean script migration	2015-04-25 23:22:44 +02:00
Laurent Destailleur	d47b9a759a	FIX migration error	2015-04-24 00:33:02 +02:00
Laurent Destailleur	807824aaad	Fix warnings	2015-04-22 21:48:59 +02:00
Laurent Destailleur	9ef809e91b	Fix migration tools	2015-04-22 20:28:21 +02:00
Laurent Destailleur	5b758e0e16	Fix migration process	2015-04-22 00:17:03 +02:00
Marcos García de La Fuente	2967bc7df7	Merge branch 'develop' into units	2015-04-19 17:19:59 +02:00
Marcos García de La Fuente	7be7a770c1	Implemented units for CommandeFournisseur and FactureFournisseur	2015-04-19 16:46:24 +02:00
Laurent Destailleur	22921ad26b	Fix phpunit	2015-04-19 04:43:28 +02:00
Marcos García de La Fuente	15b1f03a08	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/list.php htdocs/comm/prospect/list.php htdocs/societe/consumption.php htdocs/societe/soc.php	2015-04-19 00:48:07 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
Marcos García de La Fuente	2a8cf5f8be	Fixed problem with last PR #2654	2015-04-18 22:50:40 +02:00
Laurent Destailleur	25a996644d	Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:52:02 +02:00
Laurent Destailleur	9dd73de9b0	Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:47:20 +02:00
Marcos García de La Fuente	c07e26dcac	Merge branch 'develop' into fr-2613 ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:42:57 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
Florian HENRY	e15d4c045d	NEW : Propal merge product card PDF into azur	2015-04-18 18:44:05 +02:00
Maxime Kohlhaas	7223495ac2	Fix : date_delivery was not a datetime	2015-04-18 04:21:16 +02:00
Maxime Kohlhaas	07fd6a3ae7	Fix : delivery date was not a datetime	2015-04-18 04:18:40 +02:00
Laurent Destailleur	ae103e34b8	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php	2015-04-13 13:08:46 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO ... Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	74a4bca42c	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-11 22:52:27 +02:00
Laurent Destailleur	6889162d7a	Fix: management of vat type 2, 4 and 6 is now ok. ... Works for canada and ivory cost.	2015-04-11 22:51:53 +02:00
Laurent Destailleur	547b7d5f91	Fix #2539	2015-04-07 18:14:20 +02:00
frederic34	19b55cb4c1	Add public note to members	2015-04-06 18:58:36 +02:00
Laurent Destailleur	683f27f6b1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-06 14:11:52 +02:00
Laurent Destailleur	fa162cb327	Missing field	2015-04-06 14:11:28 +02:00
aspangaro	ca82c2f36d	Merge remote-tracking branch 'Upstream/develop' into develop-adherent	2015-04-06 07:53:04 +02:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units ... Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
aspangaro	d897139f25	Module member: move field note in note_private	2015-04-03 06:54:08 +02:00
aspangaro	d8f56eb406	New: better integration in project for donation module ... Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility	2015-04-02 06:36:32 +02:00
Laurent Destailleur	d8db32a99c	NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 ... approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.	2015-04-01 21:00:51 +02:00
Laurent Destailleur	8e9c1c4747	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/commande/list.php htdocs/core/class/notify.class.php htdocs/core/login/functions_dolibarr.php htdocs/exports/export.php htdocs/langs/en_US/admin.lang	2015-04-01 16:33:39 +02:00
Laurent Destailleur	16a620f926	Fix: Deadlock situation (when order were canceled, no way to make ... nothing on it) Fix: Don't know how I forgot this events into trigger system.	2015-04-01 16:07:22 +02:00
Marcos García de La Fuente	8b8171c700	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/card.php	2015-03-30 03:25:57 +02:00
aspangaro	a92f68a5ed	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-29 09:25:06 +02:00
frederic34	82b8fe6b7d	Note private and Note public for loan	2015-03-27 17:13:52 +01:00
aspangaro	9d34b40897	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/compta/bank/account.php	2015-03-24 05:28:57 +01:00
aspangaro	be0ab4c9b4	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-23 06:58:25 +01:00
aspangaro	414d4c6432	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-22 18:08:12 +01:00
Laurent Destailleur	55140afde4	Merge branch 'price-global-variables' of ... https://github.com/IonAgorria/dolibarr into IonAgorria-price-global-variables Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/dynamic_price/editor.php	2015-03-22 12:45:04 +01:00
aspangaro	462e27e069	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-21 07:13:35 +01:00
aspangaro	15e50ed24f	Update works	2015-03-21 06:21:34 +01:00
Laurent Destailleur	92af226fff	Fix Not into official 3.7 but must be into migration for 3.7 when ... migration is done by 3.8 code	2015-03-20 15:19:42 +01:00
aspangaro	c4a580723d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-20 06:36:06 +01:00
Laurent Destailleur	6ceda02eaa	NEW: Enhancement of module 'Notification by Email'. Show nb of ... notifications set. Can set several emails. Can set a threshold on amount for notifications. Add notification on supplier order validation.	2015-03-18 21:44:57 +01:00
Laurent Destailleur	5d4d8151c1	Work on new timesheet input pages.	2015-03-18 11:04:50 +01:00
aspangaro	e6d9d18f25	Update work on donation	2015-03-18 06:29:10 +01:00
aspangaro	4e83952485	Add payment on donation	2015-03-18 05:07:32 +01:00
aspangaro	1cd81f0e81	Work on module donations	2015-03-16 06:29:15 +01:00
Marcos García de La Fuente	b822a1e3ad	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/societe/class/societe.class.php	2015-03-15 18:20:17 +01:00
Ion Agorria	e76b6e740f	SQL additions	2015-03-14 16:52:01 +01:00
Juanjo Menent	971f9b0c30	Fix: Migration script	2015-03-13 22:08:24 +01:00
Laurent Destailleur	ba2c0a2651	Clean code of hooks. ... Extrafield index on fk_object must be unique.	2015-03-13 20:27:54 +01:00
aspangaro	3897e65425	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-11 05:28:59 +01:00
Laurent Destailleur	e8732df747	Merge pull request #2441 from aspangaro/develop-ReviewER ... FIXED: Review Expense Report	2015-03-11 02:14:13 +01:00
Laurent Destailleur	c271257452	Prepare extrafield for option by default into lists	2015-03-10 22:27:16 +01:00
Laurent Destailleur	51b67704ee	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-10 13:46:44 +01:00
Laurent Destailleur	dc30092290	Add column to store salary ref when doing payment.	2015-03-10 10:11:51 +01:00
Laurent Destailleur	94acbeaa22	Prepare perms on extrafields	2015-03-09 21:40:24 +01:00
aspangaro	f3258d59c6	Uniformize status & add price()	2015-03-08 07:21:07 +01:00
Laurent Destailleur	c7c7c393ee	sql syntax errors	2015-03-06 02:14:59 +01:00
aspangaro	11704e0807	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-05 20:24:53 +01:00
Laurent Destailleur	d7ab3f112c	NEW: Show difference between timespent by everybody and time spent by ... user making timesheet into timesheet pages. NEW: Can enter start hours of task when creating timesheet	2015-03-05 13:48:57 +01:00
Laurent Destailleur	7b7b5090c7	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into ... atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 23:03:29 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests ... quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Laurent Destailleur	5335a6affa	NEW: Add close date and user for projects.	2015-03-04 16:28:29 +01:00
Laurent Destailleur	60a6d8789f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-04 01:14:27 +01:00
Laurent Destailleur	fa2e57eaa3	pcpcs	2015-03-04 01:10:23 +01:00
aspangaro	c119ce382e	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-02 21:05:38 +01:00
Marcos García de La Fuente	eb99202dc2	Little changes	2015-03-02 01:10:31 +01:00
Laurent Destailleur	2795d27cc9	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang htdocs/projet/index.php	2015-03-01 16:13:22 +01:00
Laurent Destailleur	8a00109baf	Fix: Several bugs int replenishment feature.	2015-03-01 16:05:20 +01:00
Laurent Destailleur	560f1a43cd	Fix: Several bugs int replenishment feature.	2015-03-01 16:04:34 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit ... Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	7baaf18ad1	Fix can be null	2015-02-28 18:44:06 +01:00
Marcos García de La Fuente	2ba795fcbc	NEW: [ task #851 ] Add a new field: Commercial name	2015-02-28 14:30:06 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Laurent Destailleur	5d1545ad1f	Work on supplier order and customer extrafields ... Use templates to show/edit supplier order and invoice lines	2015-02-27 18:05:12 +01:00
Laurent Destailleur	22318bb800	Fix missing tables	2015-02-26 14:05:23 +01:00
aspangaro	4803a1fb89	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-25 06:59:27 +01:00
Laurent Destailleur	9842e816d0	Fix bad sql type ... Fix no input outside tr-td	2015-02-24 11:24:15 +01:00
Laurent Destailleur	eb4eededbd	Add class to manage table commande_fournisseur_dispatch	2015-02-24 11:19:47 +01:00
phf	127868899d	Merge branch 'develop' into incoterm ... Conflicts: htdocs/commande/class/commande.class.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-02-23 10:42:01 +01:00
phf	81130634d3	[CORE] intégration de incoterm sur les différentes class (#incoterm).	2015-02-23 09:16:14 +01:00
Laurent Destailleur	6e10dd3cce	Trad	2015-02-22 17:10:13 +01:00
Laurent Destailleur	2bc6ac4671	Finished new module to manage expense reports ! ... Fix export to support corectly multicompany	2015-02-22 13:16:49 +01:00
Laurent Destailleur	30a5111c68	Work on expense report module	2015-02-21 15:18:05 +01:00
aspangaro	63099727d0	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-21 15:10:35 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	d7dcf28c61	Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into ... atm-gauthier-3.7 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-02-18 23:15:40 +01:00
Laurent Destailleur	b6947dbe2c	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/modules/DolibarrModules.class.php	2015-02-18 22:04:26 +01:00
Laurent Destailleur	fe50a585fc	Fix: removed deprecated menu	2015-02-18 18:47:01 +01:00
Laurent Destailleur	ad67fe50a3	Correct management when delivery date is universal time format.	2015-02-17 17:21:41 +01:00
Laurent Destailleur	23562a01ab	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_US/stocks.lang	2015-02-16 20:59:04 +01:00
Laurent Destailleur	213c818204	Debug serial/lot management	2015-02-16 20:14:16 +01:00
Laurent Destailleur	118ae7e8f8	Backport fix done into dev.	2015-02-16 17:55:53 +01:00
Laurent Destailleur	3ca31e34cb	New: Add field "budget" (amount) on projects.	2015-02-16 10:58:05 +01:00
Laurent Destailleur	82b3f4a102	Add field budget_amount on project.	2015-02-16 10:40:09 +01:00
Laurent Destailleur	2e0b2fb012	Work on expensereport module	2015-02-15 22:49:23 +01:00
Laurent Destailleur	448655ea45	First work on a new module for expense report matching dolibarr ... standard to replace current one.	2015-02-14 18:39:45 +01:00
Laurent Destailleur	6adfc6f6f4	Work on batch module. Add batch, eatby and sellby into movement table. ... Clean language files for direct print module.	2015-02-12 15:23:31 +01:00
Gauthier	be56f76743	FIX : Display error on dispatched quantity when we have several times same product in a supplier order	2015-02-12 12:56:21 +01:00
Laurent Destailleur	179cbbd187	Maxi debug and enhancement of module batch.	2015-02-11 22:54:06 +01:00
Laurent Destailleur	fb3cf4da1e	New: The comment of the stock movement when making a supplier order ... receiving is also stored into the tracking dispatch table (not only into stock movement table).	2015-02-11 15:03:33 +01:00
phf	c7e1528594	[CORE] initialisation de l'intégration du module incoterm au corp de dolibarr (#incoterm).	2015-02-09 15:53:19 +01:00
phf	67fc6de840	[CORE] local phpunit - retrait des mauvais caractères et type des colonnes (#new_ask_price).	2015-02-09 11:57:04 +01:00
phf	ffecdc13ff	[CORE] déplacement de la création des tables du module dans le script de migration (#new_ask_price).	2015-02-09 10:38:48 +01:00
Laurent Destailleur	1776349a30	Merge pull request #2329 from atm-ph/deliverytime ... NEW Deliverytime	2015-02-08 00:00:50 +01:00
Laurent Destailleur	505f194689	Merge pull request #2319 from defrance69/patch-45 ... Update 3.6.0-3.7.0.sql	2015-02-07 23:46:12 +01:00
Laurent Destailleur	ef31ca9b84	New: Add balance of each account statement.	2015-02-07 23:32:46 +01:00
phf	0e74dd4b95	[CORE] ajout de la colonne "delivery_time_days" en bdd (#deliverytime).	2015-02-06 16:35:19 +01:00
Laurent Destailleur	556c27f834	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/stock/mouvement.php	2015-02-04 15:15:50 +01:00
BENKE Charles	79818e8693	Update 3.6.0-3.7.0.sql ... update url in llx_bank_url for remplacement of fiche.php by card.php Need to made it on 3.7 branch urgently	2015-02-04 00:45:52 +01:00
Laurent Destailleur	43f3d5805e	Merge pull request #2301 from frederic34/patch-3 ... Update 3.7.0-3.8.0.sql	2015-02-03 12:31:06 +01:00
Juanjo Menent	2fd38f310a	Increase size of localtaxX (10 is not enough in some cases)	2015-02-02 21:06:21 +01:00
Juanjo Menent	ef3dfbf3a1	Increase size of localtaxX (10 is not enough in some cases)	2015-02-02 21:04:00 +01:00
Laurent Destailleur	c19ff003ea	Merge pull request #2292 from FHenry/develop_contract_line_extrafileds ... NEW: contract lines extrafileds	2015-01-31 19:43:37 +01:00
Frédéric FRANCE	8d45d3cd59	Update 3.7.0-3.8.0.sql	2015-01-31 15:51:55 +01:00
Laurent Destailleur	1c7feb67ea	Merge branch 'dinamic-prices-product' of ... https://github.com/IonAgorria/dolibarr into IonAgorria-dinamic-prices-product Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/fournisseurs.php	2015-01-31 14:53:14 +01:00
Laurent Destailleur	4fdc287717	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/accountancy/customer/card.php htdocs/accountancy/journal/sellsjournal.php htdocs/admin/menus.php htdocs/fourn/commande/card.php htdocs/install/check.php	2015-01-30 15:53:06 +01:00
Laurent Destailleur	43702cf662	New: Enhance stock management: Introduce tag to define if a subproduct ... must have stock decreased and add inventory code on stock movements.	2015-01-30 01:51:28 +01:00
Florian HENRY	66c73ca336	add missing files for contract line extrafields	2015-01-27 12:57:36 +01:00
aspangaro	ae11ab12f6	FIXED Accounting module - Align core & module 3.6	2015-01-25 06:54:17 +01:00
Laurent Destailleur	667565f04f	Fix missing table in migration script	2015-01-19 02:38:24 +01:00
Laurent Destailleur	fdaa930507	Solve phpunit. ... Fix database field format	2015-01-19 01:58:48 +01:00
Laurent Destailleur	28148f8637	Fixed: Bad sql requests	2015-01-18 20:49:57 +01:00
Laurent Destailleur	34fe87536b	Merge pull request #2137 from frederic34/printipp ... Printing System which may accept modules	2015-01-18 13:09:41 +01:00
Laurent Destailleur	eaacb3c33b	Merge pull request #2257 from IonAgorria/per-entity-smtp ... Store per entity SMTP configuration	2015-01-18 12:33:08 +01:00
Laurent Destailleur	1681e3b03d	Fix: Not allowed types ... (http://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs)	2015-01-18 11:36:15 +01:00
Ion Agorria	48c6897f75	Store per entity SMTP configuration	2015-01-18 03:20:35 +01:00
Laurent Destailleur	eeeb6de8d9	Merge pull request #2020 from GPCsolutions/situationsinvoices ... Situations invoices support	2015-01-17 14:44:05 +01:00
Laurent Destailleur	c54355b63a	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-16 10:44:41 +01:00
Laurent Destailleur	ba49cce47a	Fix: The filter into event views on user must be done on assigned ... resource, not only owner.	2015-01-15 02:06:04 +01:00
Laurent Destailleur	fc78d632d3	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php	2015-01-09 23:09:10 +01:00
Raphaël Doursenaud	50c2b75ef8	Invoices: added situation (or interim) invoices support	2015-01-06 17:12:13 +01:00
Laurent Destailleur	2bf2c8fce7	Restore all requets	2015-01-06 00:34:23 +01:00
Laurent Destailleur	033757aafd	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/commande/fiche.php htdocs/compta/facture.php	2015-01-06 00:33:28 +01:00
Laurent Destailleur	a668d163fd	Repair corrupted data	2015-01-06 00:27:35 +01:00
frederic34	e937039596	Merge remote branch 'upstream/develop' into printipp	2014-12-28 11:59:58 +01:00
Ion Agorria	5bbcb58b44	Added expressions for product/service prices	2014-12-28 01:26:41 +01:00
Laurent Destailleur	5ead994955	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog	2014-12-26 04:57:55 +01:00
Laurent Destailleur	420ebe0be9	Fix: Change order to create fields	2014-12-26 04:04:16 +01:00
Laurent Destailleur	08fd74e79e	Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier ... invoices list	2014-12-25 12:07:27 +01:00
Laurent Destailleur	2b4edd9996	Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier ... invoices list	2014-12-23 13:21:40 +01:00
frederic34	3bf63ed0a9	Merge remote branch 'upstream/develop' into printipp	2014-12-21 14:59:37 +01:00
Ying-Chun Liu (PaulLiu)	71c5f81bdf	Handle updates for Taiwan VAT. ... Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>	2014-12-16 00:48:35 +08:00
frederic34	295fe115ab	Merge remote branch 'upstream/develop' into printipp	2014-12-08 20:33:50 +01:00
frederic34	be60c13de6	WIP Printing System	2014-12-08 20:33:26 +01:00
Laurent Destailleur	634a9d8402	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2014-12-07 19:19:48 +01:00
Laurent Destailleur	0459477097	Fix: Miscellaneous fixes for multicompany	2014-12-06 14:41:56 +01:00
Laurent Destailleur	1e8e4e7fda	Prepare 3.8 dev ... Fix bad test. Renamed table for dynamic prices.	2014-12-03 17:06:44 +01:00
Laurent Destailleur	1653384415	Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices	2014-12-03 13:14:35 +01:00
Laurent Destailleur	55b7bb532d	Fixed: Bad field of default value for fields into predefined/recuring ... invoice tables.	2014-12-01 23:50:03 +01:00
Ion Agorria	0fafe3f7d2	Required SQL changes for dinamic prices	2014-11-29 06:31:54 +01:00
Laurent Destailleur	31a5a46ffa	Merge pull request #2022 from asirinelli/3.7 ... Add EIRL in llx_c_forme_juridique	2014-11-22 16:00:32 +01:00
Laurent Destailleur	dfae42cd4a	Merge pull request #2051 from aspangaro/1690 ... #1672 VAT accounts by default are lost in migration	2014-11-22 15:41:58 +01:00
Laurent Destailleur	b5e64b66c8	Merge pull request #2025 from GPCsolutions/dbupgrade ... Work around tms bugs with MariaDB	2014-11-22 15:26:42 +01:00
aspangaro	621f2b5c77	#1672 VAT accounts by default are lost in migration	2014-11-18 21:28:12 +01:00
Laurent Destailleur	31f987706c	Fix: bugs reported by scrutinizer	2014-11-17 15:13:23 +01:00
Raphaël Doursenaud	079dbf9fbd	Work around bug #1644	2014-11-17 14:59:14 +01:00
Antoine Sirinelli	ec20b38adc	Add EIRL in llx_c_forme_juridique ... This a not so new French type of company: Entreprise Individuelle à Responsabilité Limitée (EIRL). Migration script also added.	2014-11-16 23:56:10 +01:00
Laurent Destailleur	10117d045f	Fixed #1637	2014-11-16 16:15:31 +01:00
aspangaro	c256243bf7	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-16 08:41:39 +01:00
Laurent Destailleur	11eb7de596	Try to clean sql to avoid mysql bug	2014-11-15 14:14:52 +01:00
BENKE Charles	6cee8e1294	Update 3.6.0-3.7.0.sql ... increase fieds size of ref supplier (order and bill)	2014-11-13 11:24:45 +01:00
aspangaro	a55afd4f50	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-12 07:32:32 +01:00
Laurent Destailleur	7177c04378	Minor css enhancement	2014-11-11 20:45:30 +01:00
aspangaro	3042bf4dc2	Correct lot of bugs	2014-11-10 06:08:50 +01:00
aspangaro	9c3fa5a9eb	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-09 07:26:14 +01:00
Laurent Destailleur	9ae03f533d	Test	2014-11-08 00:35:28 +01:00
Laurent Destailleur	7ca2e275df	Track travis bug	2014-11-08 00:10:05 +01:00
aspangaro	840dfd780d	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-07 21:28:39 +01:00
Laurent Destailleur	633e34da52	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-06 13:47:38 +01:00
Laurent Destailleur	b68bfac593	Fix: Usage of migration scripts from command line	2014-11-06 13:46:12 +01:00
Juanjo Menent	6f9d283ddc	Fix: Module notifications DB Error "unknown field type" into third tab ... notifications	2014-11-06 11:20:47 +01:00
Laurent Destailleur	0d62556fa0	Maj doc	2014-11-05 11:01:53 +01:00
aspangaro	cbfa90abca	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 20:57:05 +01:00
Laurent Destailleur	5656773430	Update doc	2014-11-04 17:42:01 +01:00
Laurent Destailleur	899fecb484	Some maintenance sqls	2014-11-04 16:40:01 +01:00
aspangaro	25433120e6	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 06:16:03 +01:00
Laurent Destailleur	cf6a0df3e4	A lot of fix in missing intervention trigger. Align key to use same name ... to avoid future bugs.	2014-11-03 17:23:02 +01:00
Laurent Destailleur	155452ba91	Fix: Proposal deadlock situation ... New: Add missing trigger PROPAL_CLASSIFYBILLED.	2014-11-03 16:20:55 +01:00
Laurent Destailleur	a1a10edc30	Merge pull request #1987 from IonAgorria/soap-client-order ... Added SOAP client for creating a client order in remote webservice	2014-11-01 21:14:19 +01:00
Ion Agorria	82aa8458bf	Added ws url/key to thirdparty SQL table, class and info page	2014-10-31 17:46:11 +01:00
Laurent Destailleur	9c51effe5c	Ajout plus d'info dans description audit.	2014-10-31 15:42:35 +01:00
Laurent Destailleur	fb4858a5d3	Update changelog	2014-10-30 18:07:09 +01:00
Laurent Destailleur	38a939771c	New: Add template of emails into dictionnary.	2014-10-30 17:16:51 +01:00
Laurent Destailleur	a1a03a8061	New: Module notification has been enhanced: ... EMail use now language of target contact. Can also define a fixed email for notifications. Better error management	2014-10-25 01:20:59 +02:00
Laurent Destailleur	0fba70d4d1	Fix: Triggers sending email for intervention and classify billed	2014-10-20 11:35:34 +02:00
Laurent Destailleur	718b3b19b4	Fix: user and date modification not updated	2014-10-20 11:16:51 +02:00
Laurent Destailleur	e53c328767	Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into ... aspangaro-develop-favorite Conflicts: ChangeLog htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-10-18 15:45:44 +02:00
aspangaro	9f6a460d42	Merge remote-tracking branch 'Upstream/develop' into develop-favorite ... Resolve conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-10-18 15:32:50 +02:00
Maxime Kohlhaas	737cafef4e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols	2014-10-15 15:02:36 +02:00
Regis Houssin	a1210da513	Fix: missing entity in unique index	2014-10-14 20:19:02 +02:00
Maxime Kohlhaas	452636b0e4	New : Add option to allow extrafield to be modified regardless of the document status	2014-10-14 15:27:40 +02:00
aspangaro	861583bb77	Merge remote-tracking branch 'Upstream/develop' into develop-favorite	2014-10-14 06:12:46 +02:00
Laurent Destailleur	2cf21f856c	Fix: table name differs.	2014-10-14 01:47:31 +02:00
Laurent Destailleur	f498921715	Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into ... GPCsolutions-droposcommerce Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/vi_VN/admin.lang htdocs/langs/vi_VN/shop.lang	2014-10-13 00:50:51 +02:00
aspangaro	dc6817813e	Merge remote-tracking branch 'Upstream/develop' into develop-favorite	2014-10-12 20:23:08 +02:00
Laurent Destailleur	3bac7c9e11	Add index on new table llx_c_email_template	2014-10-12 16:31:56 +02:00
aspangaro	71dafac03c	Add favorite button into country dictionary to put value on top select list	2014-10-12 15:28:01 +02:00
Laurent Destailleur	44e2cd2194	Prepare code to manage task_datehour with task_date.	2014-10-12 01:20:03 +02:00
Laurent Destailleur	00fd9acf31	Fix: Bad length of field ... Transifex sync	2014-10-09 18:32:23 +02:00
Laurent Destailleur	e76b5a370d	Fix: bad parameter	2014-10-09 17:27:14 +02:00
aspangaro	c1db82a791	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-10-04 08:10:12 +02:00
Laurent Destailleur	e70aebf2c7	Merge pull request #1937 from fappels/develop ... Expedition lines from same orderline merged.	2014-10-04 00:58:19 +02:00
Francis Appels	269df77873	Fix migration sql for inserting accounting records ... Migration SQL could not insert accounting records because datec was set to NOT NULL	2014-10-03 12:59:33 +02:00
aspangaro	f70e8b766f	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-09-29 20:40:53 +02:00
aspangaro	d3252d1348	Update	2014-09-29 20:37:51 +02:00
Raphaël Doursenaud	f01e76f686	Removed unmaintaned OScommerce module	2014-09-29 15:22:48 +02:00
Florian HENRY	ce145cc056	Add cache excel export on harddrive with ... MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack overflow on large excel export	2014-09-29 10:16:48 +02:00
Regis Houssin	f233d4f610	New: add doc models management in contract module	2014-09-28 20:39:02 +02:00
Florian HENRY	14ca936cfc	set ref_supplier for contract field	2014-09-24 10:21:26 +02:00
Laurent Destailleur	40c1b02a6c	Correction repair.sql	2014-09-24 01:15:34 +02:00
Laurent Destailleur	dd86453020	Add field color into table of type of events	2014-09-23 17:54:03 +02:00
Laurent Destailleur	640bf7c34b	Uniformize field name	2014-09-23 12:18:42 +02:00
Laurent Destailleur	e1fec958ef	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/user/group/fiche.php	2014-09-22 23:43:22 +02:00
Alexis Algoud	de0d53a2bb	ADD extrafields on usergroup	2014-09-22 16:31:58 +02:00
aspangaro	e147259e95	Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6	2014-09-21 20:30:55 +02:00
Laurent Destailleur	ee4d697172	Fix several bugs reported by scrutinizer	2014-09-19 14:57:31 +02:00
Laurent Destailleur	f9976bdb6a	Qual: Uniformize field names.	2014-09-19 11:03:07 +02:00
Laurent Destailleur	f2acb048cc	Qual: Uniformize fields name.	2014-09-18 18:02:22 +02:00
Laurent Destailleur	9666d5e3ae	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/.gitignore htdocs/core/lib/functions2.lib.php htdocs/install/mysql/migration/repair.sql htdocs/langs/en_US/errors.lang	2014-09-18 10:17:43 +02:00
Laurent Destailleur	9c54dc57df	Save some usefull cleaning requests into repair.sql	2014-09-17 12:31:35 +02:00
Laurent Destailleur	23eee1b83a	New: Add hourly and daily amount on user card. Add weekly working hours ... and salary on user card.	2014-09-13 17:41:26 +02:00
Laurent Destailleur	27ba1680bf	Add field weeklyhours.	2014-09-09 15:29:54 +02:00
aspangaro	9f92446dba	Merge branch 'Upstream/develop'	2014-08-31 07:44:46 +02:00
Laurent Destailleur	f64cb085a7	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: ChangeLog htdocs/fourn/class/fournisseur.commande.class.php	2014-08-30 18:27:34 +02:00
aspangaro	bb7aa9f29c	Merge branch 'Upstream/develop'	2014-08-29 06:33:00 +02:00
Laurent Destailleur	5e95daad91	Fix: Sql syntax error	2014-08-28 16:18:17 +02:00
Laurent Destailleur	22fb37f856	Fix: Sql syntax for extrafield table of interventions	2014-08-28 15:00:09 +02:00
Laurent Destailleur	b810e6e556	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-08-28 12:19:46 +02:00
Laurent Destailleur	dcce6731fe	Fix: Sql errors	2014-08-28 12:19:24 +02:00
Laurent Destailleur	a1e92b464f	Merge pull request #1848 from atm-alexis/develop_feature_intervention_lines_extrafields ... Feature : Add extrafields on intervention's lines	2014-08-28 12:00:43 +02:00
aspangaro	71265558d2	Integrate module Accounting Expert	2014-08-27 07:03:42 +02:00
Laurent Destailleur	c3fe0c1ae9	Fix: sql errors into migration scripts	2014-08-26 23:08:06 +02:00
Laurent Destailleur	4b4360af32	Fix: sql syntax errors	2014-08-26 23:02:21 +02:00
Alexis Algoud	85228fd8e7	add support in admin	2014-08-26 11:50:02 +02:00
Alexis Algoud	a3469f1f01	FIX bug on migration 3.6 -> 3.7	2014-08-26 11:27:57 +02:00
aspangaro	b7daef10c6	Fix llx_c_type_resource when you update from a 3.6-beta	2014-08-26 04:35:22 +02:00
aspangaro	af92eb3725	Problem of merging	2014-08-20 07:49:53 +02:00
aspangaro	f774ff487b	Merge branch 'Upstream/develop'	2014-08-18 11:56:49 +02:00
Laurent Destailleur	45927cc986	Fix pb of links into state-region-country: ... - no more rowid into insert sql requests - link, so foerign key must be on fk_region->code_region - label was not visible - unique keys must be into file .key.sql	2014-08-17 17:47:25 +02:00
Laurent Destailleur	aee35c86d6	Perf: Removed a useless distinct, add indexes.	2014-08-15 02:11:01 +02:00
aspangaro	fe3939debe	Drop old index	2014-08-14 06:42:28 +02:00
Laurent Destailleur	18b44ccfae	Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into ... aspangaro-develop-favorite Conflicts: htdocs/core/class/html.form.class.php	2014-08-14 01:04:15 +02:00
Laurent Destailleur	de3d66eaeb	Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into ... aspangaro-develop-accounting3 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-08-14 00:59:48 +02:00
Laurent Destailleur	e3f96802fb	Fix: sql bad use. ... Qual: Incrase sql syntax test by phpunit to migration scripts. Qual: Removed old migration script before 3.0.0	2014-08-14 00:09:09 +02:00
Florian HENRY	eca9408c91	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: ChangeLog htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-08-12 12:37:31 +02:00
aspangaro	1a87d98357	Qual: Renamed table llx_c_civilite into llx_c_civility ... field civilite into label in the same table and field civilite into civility in other table	2014-08-12 06:03:27 +02:00
aspangaro	9af336b53b	Add accountancy code for trips & fees and renamed libelle field into label	2014-08-10 20:41:52 +02:00
aspangaro	0738103da8	Renamed llx_c_pays to llx_c_country & field "libelle" to "label"	2014-08-10 13:37:39 +02:00
Laurent Destailleur	2bfde7ba30	Add table llx_holiday_types to store type of leave.	2014-08-06 03:01:17 +02:00
Laurent Destailleur	f863604621	Prepare table for email templates.	2014-08-05 12:28:10 +02:00
Laurent Destailleur	c2be3364e0	Merge remote-tracking branch 'origin/3.6' into develop	2014-08-04 22:19:53 +02:00
Laurent Destailleur	96362b40e4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-08-04 10:55:09 +02:00
Laurent Destailleur	be89fddc52	Uniformize field list	2014-08-04 10:54:22 +02:00
Laurent Destailleur	b5bb4c639c	Fix: Clean data	2014-08-04 00:15:23 +02:00
Laurent Destailleur	7d3c266a1d	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/agenda_other.php htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php htdocs/install/mysql/migration/repair.sql	2014-08-04 00:02:00 +02:00
Laurent Destailleur	bf7a33494e	Run request to clean data	2014-08-03 23:55:33 +02:00
Laurent Destailleur	c11ff57fbe	Fix: The type is a code so must not contains any space. ... Fix: State is not linked to region.	2014-08-03 11:17:24 +02:00
Laurent Destailleur	331cb38a10	A little clean of tables.	2014-08-02 21:56:39 +02:00
Laurent Destailleur	8ed21f606e	Qual: states are linked to regions.	2014-08-02 21:16:43 +02:00
Laurent Destailleur	2d97ad5177	Merge pull request #1771 from frederic34/selectdelivery ... Select Shipping Method in Propal, Order	2014-07-30 11:31:22 +02:00
Juanjo Menent	2783ec7dc8	New: Add PYME (base) accountancy spanish plan	2014-07-29 00:00:34 +02:00
frederic34	395b003266	Merge remote branch 'upstream/develop' into selectdelivery ... Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-07-28 17:10:07 +02:00
Laurent Destailleur	3d56c8ff6a	Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ	2014-07-26 18:20:40 +02:00
frederic34	4fcff3e2e5	Select delivery method for order	2014-07-25 17:20:42 +02:00
frederic34	f0a7cc3268	Select Shipping Method in Propal	2014-07-24 18:08:08 +02:00
Florian HENRY	cf63f1a40d	Remane contract ref_ext to ref_supplier	2014-07-21 08:36:59 +02:00
Laurent Destailleur	d80de2cdd4	Fix: Clean before adding foreign key	2014-07-20 04:42:05 +02:00
Marcos García de La Fuente	ec661d0c6c	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
Florian HENRY	d2e17eb321	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: ChangeLog	2014-07-11 16:09:01 +02:00
Laurent Destailleur	4dfaf9ce38	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-07-11 13:56:57 +02:00
Laurent Destailleur	32b015e661	New: Type of thirdparties can accept a country (to show list of types ... specific for a country).	2014-07-11 13:56:35 +02:00
Florian HENRY	c7d31f4570	[ task #1204 ] Add ref_int contract field	2014-07-11 11:26:54 +02:00
frederic34	8c7b8bba52	Merge remote branch 'upstream/develop' into selectbank	2014-07-09 10:07:49 +02:00
Laurent Destailleur	e659b9e693	Merge remote-tracking branch 'origin/3.6' into develop	2014-07-09 00:30:23 +02:00
Laurent Destailleur	32c15132df	Fix: sql syntax error	2014-07-08 23:19:46 +02:00
frederic34	c8e6387e52	Merge remote branch 'upstream/develop' into selectbank ... Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-07-08 22:46:38 +02:00
Laurent Destailleur	8bad4a3c1d	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql htdocs/install/mysql/tables/llx_product_batch.key.sql	2014-07-08 22:45:31 +02:00
Laurent Destailleur	f0056b3b95	Fix: Migration does not match tables	2014-07-08 22:40:06 +02:00
Laurent Destailleur	e624049161	Fix: Pb with migration with pgsql	2014-07-08 22:12:20 +02:00
Laurent Destailleur	a137b31a47	Fix: ON DELETE CASCADE is forbidden. ... Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql test/phpunit/SqlTest.php	2014-07-08 21:50:29 +02:00
frederic34	beb471980e	Add fields for supplier order and invoice	2014-07-08 21:50:21 +02:00
Laurent Destailleur	2b83d3fda7	Fix: File for migration 3.5 to 3.6 was modified.	2014-07-08 21:44:55 +02:00
Laurent Destailleur	9b6b5feb4f	Fix: ON DELETE CASCADE is forbidden.	2014-07-08 21:38:20 +02:00
Laurent Destailleur	94cd8debeb	Fix: table declaration ... Fix: regretion into trigger management	2014-07-08 21:24:36 +02:00
Laurent Destailleur	688d58413b	Merge pull request #1710 from aspangaro/develop-accounting2 ... New feature :: Add fiscal year	2014-07-07 21:28:35 +02:00
Laurent Destailleur	1a2ed2138b	New: Add new type of event (when type of events are used, not by ... default)	2014-07-06 21:25:25 +02:00
Laurent Destailleur	ce3fa14511	New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to ... create an automatic event into agenda. Qual: Removed hard coded rowid into data init.	2014-07-06 19:25:15 +02:00
aspangaro	9eaeaae2fb	Merge branch 'Upstream/develop'	2014-07-05 08:48:51 +02:00
aspangaro	be78e96313	Bug fix & add tab info	2014-07-05 08:47:01 +02:00
Laurent Destailleur	baea822ed5	Fix: Migration script	2014-07-04 18:24:48 +02:00
Laurent Destailleur	e496823778	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: .travis.yml ChangeLog htdocs/fourn/commande/fiche.php htdocs/install/mysql/migration/3.5.0-3.6.0.sql htdocs/product/stock/replenish.php	2014-07-04 14:14:40 +02:00
Laurent Destailleur	f9ee4b3c9d	Merge branch 'db-relations' of github.com:marcosgdf/dolibarr into ... marcosgdf-db-relations Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-07-04 14:06:07 +02:00
Laurent Destailleur	9fa44e6221	Merge pull request #1706 from frederic34/patch-2 ... Update 3.6.0-3.7.0.sql	2014-07-04 13:21:57 +02:00
Juanjo Menent	72243d4f38	fix: Timestamp with default null	2014-07-04 12:32:57 +02:00
FRANCE Frédéric	8fc2d5ebb8	Update 3.6.0-3.7.0.sql ... llx_c_product doesn't exist	2014-07-03 20:38:33 +02:00
Juanjo Menent	cb4c3a4431	[ task #1063 ] Allow edit localtaxes rate for thirds. Works ... withd database	2014-07-03 15:51:46 +02:00
Laurent Destailleur	a1b6aedc90	Add field task_datehour	2014-07-03 12:53:26 +02:00
Marcos García de La Fuente	e351657cc0	Removed key restrictions	2014-07-03 10:16:37 +02:00
Marcos García de La Fuente	d38bebf990	Created foreign key relations for llx_product and llx_product_price table	2014-07-02 21:04:34 +02:00
Laurent Destailleur	de527365a8	Fix: [ bug #1517 ] Packages sizes	2014-07-02 20:10:44 +02:00
Laurent Destailleur	b985dc3342	Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into ... aspangaro-develop-accounting Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/install/mysql/tables/llx_bank_account.sql	2014-06-30 00:42:17 +02:00
Laurent Destailleur	6cf8c3d08c	Merge branch 'develop' of github.com:aspangaro/dolibarr into ... aspangaro-develop Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-06-29 23:57:57 +02:00
Laurent Destailleur	e2472351c3	Merge branch 'fix1487' of github.com:KreizIT/dolibarr into ... KreizIT-fix1487 Conflicts: ChangeLog	2014-06-29 23:42:38 +02:00
aspangaro	5cc8ec4f5f	Add accountancy code journal into bank card & modify presentation	2014-06-29 20:10:43 +02:00
aspangaro	53bd5022e0	Align size for accounting account & Drop old table & Typo	2014-06-29 07:57:42 +02:00
aspangaro	25f2fec473	Fix :: acount_parent must be an int - Final step	2014-06-29 07:02:13 +02:00
Laurent Destailleur	1dafb58f09	Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into ... aspangaro-develop-accounting3 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-06-26 22:53:25 +02:00
Laurent Destailleur	e2790895ad	Prepare 3.7 development.	2014-06-26 21:48:57 +02:00
aspangaro	865d853af8	Add migration file to 3.7 & update llx_c_paiement	2014-06-24 06:02:17 +02:00
Florian HENRY	df9f153142	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.5.0-3.6.0.sql	2014-06-17 12:01:45 +02:00
Laurent Destailleur	882fc42ea1	Fix: 3.5 migration that was not complete. Second chance into 3.6.	2014-05-29 20:39:51 +02:00
Laurent Destailleur	b15c79845e	Merge remote-tracking branch 'origin/3.5' into develop	2014-05-29 20:27:21 +02:00
Laurent Destailleur	67bd18f5cc	Fix: [ bug #1406 ] Impossible de modifier une facture fournisseur	2014-05-29 20:25:41 +02:00
Florian HENRY	0cfd4504ad	add index on llx_mailing_cible	2014-05-29 14:48:07 +02:00
Florian HENRY	26b74a53a2	Fix initdata 3.6 for CommandeFournisseurTest.php run correctly	2014-05-14 14:17:03 +02:00
Jean-François Ferry	7fbcb4fe7d	Missing auto-increlent attribute when table c_resource_type create	2014-05-10 22:07:12 +02:00
Jean-François Ferry	5f74b86b18	Add dictionary to define type of resources	2014-05-10 22:07:12 +02:00
Jean-François Ferry	1d929d267c	Move table creation instruction into migration tables	2014-05-10 22:07:12 +02:00
Laurent Destailleur	40577ab445	New: Can enter holiday for someone else if user has permission for.	2014-05-07 15:03:05 +02:00
Laurent Destailleur	9f795331f5	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: ChangeLog build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/compta/paiement_charge.php htdocs/compta/sociales/charges.php htdocs/core/db/mysql.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php	2014-05-06 23:58:17 +02:00
Laurent Destailleur	503924fbbc	Fix: Missing cleaning orphelins for contact categories.	2014-05-06 21:56:31 +02:00
Laurent Destailleur	959b104b78	Fix: the pdf template name for typhon as not correctly set when enabling ... module.	2014-05-06 13:31:30 +02:00
Laurent Destailleur	d25778f12b	Qual: Removed duplicate column "datea" into table llx_societe ... (duplicated with column tms).	2014-05-04 16:59:13 +02:00
Laurent Destailleur	03f9f0bada	Fix: Pb of records not correctly cleaned when module marge is ... uninstalled (conflict between 'margin' and 'margins').	2014-05-03 20:21:35 +02:00
Laurent Destailleur	4a23a8a789	Merge branch 'category_translate' of github.com:aternatik/dolibarr into ... aternatik-category_translate Conflicts: ChangeLog	2014-04-28 02:39:56 +02:00
Laurent Destailleur	97fce71218	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/lib/functions2.lib.php htdocs/install/mysql/migration/repair.sql htdocs/langs/en_US/errors.lang htdocs/product/fiche.php htdocs/projet/tasks/task.php	2014-04-26 22:35:35 +02:00
Laurent Destailleur	537ada96a8	Fix: [ bug #1354 ] Tasks disapear in same sub-task ... Conflicts: htdocs/install/mysql/migration/repair.sql htdocs/projet/class/project.class.php	2014-04-26 21:47:15 +02:00
Laurent Destailleur	4ecfa1d6e0	Clean corrupted data for categories ... Conflicts: htdocs/install/mysql/migration/repair.sql	2014-04-26 21:40:57 +02:00
Laurent Destailleur	af2cf0b66f	Fix: [ bug #1354 ] Tasks disapear in same sub-task	2014-04-26 21:36:58 +02:00
Laurent Destailleur	950c59eb61	Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers.	2014-04-26 17:34:39 +02:00
Laurent Destailleur	ae23d78c74	Add field nb_holidays and salary.	2014-04-25 20:06:19 +02:00
jfefe	d256799abf	Work on adding catgory translation	2014-04-25 15:17:12 +02:00
Laurent Destailleur	002e64d514	Add table for email templates. ... Removed deprecated table llx_domain.	2014-04-23 13:10:08 +02:00
Laurent Destailleur	459e5f7472	Clean corrupted data for categories	2014-04-23 11:25:05 +02:00
Raphaël Doursenaud	e6c0321fb6	Automatic events for project tasks	2014-04-22 15:30:10 +02:00
Raphaël Doursenaud	0d7a76d8db	3.6 migration script: fixed invalid comments	2014-03-27 12:04:03 +01:00
Raphaël Doursenaud	ee71e42b34	Action triggers: added missing triggers to 3.6 migration script ... These are the same changes than commit 3afb3a874d9d1533947651de9db28c9207278908 but for the migration script	2014-03-27 12:03:19 +01:00
Laurent Destailleur	4d4512fadd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-03-26 22:14:14 +01:00
Laurent Destailleur	c45f509984	Qual: Uniformizing payments	2014-03-26 15:41:09 +01:00
Laurent Destailleur	59042a30e1	Fix and uniformize code for payment of salaries.	2014-03-25 21:35:52 +01:00
Laurent Destailleur	6764d36434	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-03-19 11:46:30 +01:00
Laurent Destailleur	44952e353d	Fix: Bad format for fk_currency fields (even if they are not used, i fix ... them).	2014-03-19 11:46:06 +01:00
Laurent Destailleur	dbaea6fa42	Add clean sql requests into repair.sql	2014-03-19 11:40:23 +01:00
Laurent Destailleur	20ef4554e0	Fix: missing unique key on barcode field to avoid database corruption	2014-03-18 23:43:58 +01:00
Laurent Destailleur	9be52ca2c8	Fix: better way to remove duplicate barcode in repair.sql	2014-03-18 22:16:18 +01:00
Laurent Destailleur	e491a4dce7	Add code to clean duplicate records	2014-03-17 20:29:01 +01:00
Laurent Destailleur	7974ae96ad	Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr ... into aternatik-cat_extrafields Conflicts: htdocs/install/mysql/migration/3.5.0-3.6.0.sql	2014-03-16 21:38:29 +01:00
Laurent Destailleur	eb5e891cf9	Fix: Not mandatory field must not be not null ... Fix: field to store amount must be double(24,8)	2014-03-16 20:37:43 +01:00
Jean-François Ferry	55750e16d8	Prepare extrafields into categories	2014-03-16 14:48:46 +01:00
Maxime Kohlhaas	0083e529c7	Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost	2014-03-16 14:31:02 +01:00
Laurent Destailleur	c9ac7fad82	Fix: Field should not be not null	2014-03-15 15:45:21 +01:00
Maxime Kohlhaas	67342486a6	Task 1074 : add link to source document on stock movement	2014-03-15 02:18:39 +01:00
Laurent Destailleur	4154f07dfd	New: Add a public url as a property for products/services.	2014-03-14 13:51:46 +01:00
Laurent Destailleur	aab4800f87	Fix: sql syntax error with pgsql	2014-03-14 12:50:45 +01:00
Laurent Destailleur	3c842f9b6f	New: Add barcode fields into user database.	2014-03-13 09:11:14 +01:00
aspangaro	12ffb19cec	Use more explicit name for class and functions	2014-03-11 06:26:18 +01:00
aspangaro	fca29f4312	Add table into script migration && key language	2014-03-06 21:29:20 +01:00
Laurent Destailleur	e9b9491a35	Clean database. Fix with firefox.	2014-03-05 12:15:47 +01:00
Laurent Destailleur	60327e92d1	New: Add filter on text and status into survey list. Can also sorter on ... id, text and date end.	2014-03-05 11:22:01 +01:00
KreizIT	c1f88d99b9	Batch number management step 1 : database modification	2014-03-03 14:11:19 +01:00
Florian Henry	46ae5d6e9c	- New: Price management enhancement (multiprice level, price by ... customer, if MAIN_FEATURES_LEVEL=2 Price by qty) - Fix: Project Task numbering rule customs rule works	2014-02-23 16:16:47 +01:00
Florian Henry	92dc21be04	Fix project task numbering rule	2014-02-23 10:24:30 +01:00
Laurent Destailleur	444bc1c6a1	New increase length of url into bookmark module.	2014-02-10 16:05:13 +01:00
Laurent Destailleur	46e9b5d550	Merge branch 'develop' of https://github.com/grandoc/dolibarr into ... grandoc-develop Conflicts: htdocs/langs/ar_SA/admin.lang htdocs/langs/el_GR/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/tr_TR/admin.lang	2014-02-10 01:30:48 +01:00
Laurent Destailleur	e71fb36b3c	Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually. ... We keep bic size field to 20 instead of 11 for backward compatibility.	2014-02-10 01:08:49 +01:00
Laurent Destailleur	59a25832bd	Fix: Removed large comment into migration script	2014-02-08 12:16:27 +01:00
aspangaro	05c8039cf9	Delete rowid in case of an other accountancy plan already exist.	2014-02-02 09:50:53 +01:00
aspangaro	fda0dec260	Add The base accountancy belgium plan for accounting - Thanks delcroip ... http://www.dolibarr.fr/forum/12-howto--aide/47966-pcmn-plan-comptable-minimum-normalise-belgique	2014-02-02 06:45:05 +01:00
Laurent Destailleur	5b218c3c5c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.5.0-3.6.0.sql	2014-01-31 10:10:38 +01:00
Laurent Destailleur	bb7fc8631b	Qual: Uniformize index name to match ... http://wiki.dolibarr.org/index.php/Language_and_development_rules#SQL_rules	2014-01-31 10:08:25 +01:00
Jean-François Ferry	a0c3527e30	Fix : bad sql request during migration	2014-01-29 19:19:23 +01:00
Laurent Destailleur	7c01fd98b3	Fix: use allowed database types	2014-01-28 15:45:00 +01:00
Marcos García de La Fuente	fc7d3d4771	Modified migration script to not remove columns	2014-01-06 05:39:22 +01:00
Marcos García de La Fuente	c245e86b60	Little changes to the opensurvey_sondage table definition	2014-01-06 05:17:02 +01:00
Marcos García de La Fuente	c2c97ec82a	Mailsonde should not be a varchar	2014-01-06 05:12:47 +01:00
Marcos García de La Fuente	e0c7eb545c	Email and poll author are now retrieved from the logged user	2014-01-06 05:08:42 +01:00
Marcos García de La Fuente	8d96675607	Force logged user to create surveys and applied Dolibarr style to poll creation wizard	2014-01-05 09:08:42 +01:00
Marcos García de La Fuente	c9db0c3a94	Removed “stupid” feature to allow voters edit other users’ vote	2014-01-04 19:51:44 +01:00
Marcos García de La Fuente	13d4ea4c38	Added a new feature to disable spying other users’ vote	2014-01-03 23:30:15 +01:00
Marcos García de La Fuente	1a038fac06	Removed the use of id_sondage_admin and survey_link_visible fields of llx_opensurvey_sondage	2014-01-03 22:13:15 +01:00
Marcos García de La Fuente	a5b9122e98	Allow to disable poll comments	2014-01-03 17:44:42 +01:00
Raphaël Doursenaud	5e642f3009	Bookmarks multicompany migration	2013-12-10 12:00:42 +01:00
Laurent Destailleur	bfd229d484	Fix: [ bug #1079 ] External users can't access projects even if it is a ... contact.	2013-12-01 18:14:19 +01:00
Laurent Destailleur	cbf1ddaa17	Fix: [ bug #1079 ] External users can't access projects even if it is a ... contact.	2013-12-01 16:01:33 +01:00
Laurent Destailleur	b71406f12d	Merge pull request #1322 from aspangaro/develop ... Improvement of the Skype button	2013-11-26 07:29:37 -08:00
Grand Philippe	1f7e6a42c2	add a Social contributions type and fix some language stuff	2013-11-24 11:33:36 +01:00
Laurent Destailleur	9156e9168f	Add upgrade script	2013-11-23 13:19:55 +01:00
Laurent Destailleur	63e1ecccd3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2013-11-20 12:46:05 +01:00
Laurent Destailleur	b04a12c39a	Missing vat rate for canada	2013-11-20 12:45:38 +01:00
Laurent Destailleur	0e743d5024	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/adherents/admin/adherent.php htdocs/comm/propal/class/propal.class.php htdocs/commande/document.php htdocs/compta/facture/class/facture.class.php htdocs/compta/facture/list.php htdocs/cron/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/commande/document.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cron.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/nl_NL/categories.lang htdocs/langs/nl_NL/commercial.lang htdocs/langs/nl_NL/companies.lang htdocs/langs/nl_NL/dict.lang htdocs/langs/nl_NL/main.lang htdocs/langs/nl_NL/margins.lang htdocs/langs/nl_NL/products.lang htdocs/societe/class/societe.class.php htdocs/societe/rib.php	2013-11-19 21:08:02 +01:00
Laurent Destailleur	e8101e3cde	Fix: Missing field	2013-11-18 12:00:42 +01:00
Laurent Destailleur	5b243abe4b	Fix: Miscellaneous fixes	2013-11-16 12:00:08 +01:00
Laurent Destailleur	1e008ede3c	Merge pull request #1298 from Pfontaine/features/multi_rib ... Features/multi rib	2013-11-15 06:27:58 -08:00
Peter Fontaine	b965103fc3	Multiple Bank Account Number for Third Party	2013-11-13 15:40:17 +01:00
Laurent Destailleur	995bec6112	Fix: bad migration of 3.4 that make this text instead of varchar(50)	2013-11-13 15:09:22 +01:00
Raphaël Doursenaud	4ad5413163	Sync db upgrade with db install to avoid silly upgrade errors	2013-11-12 15:36:51 +01:00
Cédric Salvador	89f9a871d0	updated migration script	2013-11-06 10:19:17 +01:00
Cédric Salvador	26aa0c1d7a	links sql table	2013-11-06 10:11:40 +01:00
aspangaro	76263213ab	Merge branch 'origin/develop'	2013-11-04 22:04:36 +01:00
aspangaro	d79ba9695a	Task 157 : Add a skype button	2013-11-04 21:41:36 +01:00
Florian Henry	c465cc621d	Fix actioncomm_ressource column name	2013-11-04 19:27:59 +01:00
Florian Henry	c0ad86cd5c	Add column fk_c_element_role into llx_actioncomm_ressource to manage ... role of linked element In this exemple we can have fk_element = 1 element_type= "user" or contact or place or whatever element fk_c_element_role = 1 // 'Guest' or Host or whatever define in dictionnary fk_c_element_status = Present // or whatever define in dictionnary according element type	2013-10-31 13:23:38 +01:00
Florian Henry	70bbe10f9e	Start Task 172	2013-10-31 01:21:09 +01:00
Florian Henry	27e4852a35	upgrade process to change const SOCIETE_DONOTSEARCH_ANYWHERE to ... COMPANY_DONOTSEARCH_ANYWHERE	2013-10-30 12:27:36 +01:00
Laurent Destailleur	315e2e4c13	Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into ... defrance69-patch-14 Conflicts: htdocs/install/mysql/migration/3.4.0-3.5.0.sql	2013-10-20 14:12:56 +02:00
Laurent Destailleur	7b53ad5580	Fix: Missing field required by update_price	2013-10-18 01:09:41 +02:00
Laurent Destailleur	b039dc94f5	Missing migration of new table	2013-10-13 14:53:40 +02:00
BENKE Charles	5bae0dbc18	Update 3.4.0-3.5.0.sql	2013-10-06 17:14:50 +02:00
Laurent Destailleur	db7bcfd748	Fix: Sending email from thirdparty must add event into agenda if option ... is on.	2013-09-25 21:36:40 +02:00
Laurent Destailleur	b6a083596a	Merge remote-tracking branch 'origin/3.4' into develop	2013-09-24 20:21:32 +02:00
Laurent Destailleur	a3e74afb02	Fix: varchar 256	2013-09-24 20:14:42 +02:00
Laurent Destailleur	42f5ca15df	Fix: Add missing field info_bits into predefined invoices.	2013-09-19 14:58:35 +02:00
BENKE Charles	14e96f5c1b	Update 3.4.0-3.5.0.sql	2013-09-17 10:39:30 +02:00
Laurent Destailleur	edaeaf3803	Fix: field is not mandatory	2013-09-08 00:23:32 +02:00
Florian Henry	5ea6518a6d	Fix PgSQL upgrade process failed	2013-08-26 10:47:43 +02:00
lalaina rasamoelina	8a4041e534	T975-develop Add an element (statut) in the table llx_socpeople ... It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this) And if the contact is gone,we don't print her mail in the mail list,where we can send a mail	2013-08-22 11:04:06 +02:00
Laurent Destailleur	0f86755033	Fix: Found a dozen of bugs into sub module delivery of module shipment. ... Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/expedition/class/expedition.class.php htdocs/expedition/fiche.php	2013-08-07 15:29:13 +02:00
Laurent Destailleur	d5a57f3717	Fix: Found a dozen of bugs into sub module delivery of module shipment.	2013-08-07 15:08:30 +02:00
Laurent Destailleur	af026690d4	Fix: Bad sql requests	2013-08-01 12:22:05 +02:00
Maxime Kohlhaas	bfb01da04f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011	2013-07-30 16:22:13 +02:00
Maxime Kohlhaas	5a38a43c87	Task # 1011 : now supplier order and invoice deal with payment terms and mode	2013-07-30 16:21:39 +02:00
Maxime Kohlhaas	dae36229a4	Task # 1011 : add payment terms and payment mode on supplier card	2013-07-30 15:06:57 +02:00
Cédric Salvador	aae8a62368	added the desiredstock parameter in the SQL scripts	2013-07-29 12:31:04 +02:00
Laurent Destailleur	e3b38cf3bb	Fix: SQL Syntax error. ... Fix: A ref_ext can not be NOT NULL. New: Add tms field into table llx_bordereau_cheque.	2013-07-19 14:09:17 +02:00
Maxime Kohlhaas	7abc53698a	Add RefExt field on RemiseCheque	2013-07-19 08:54:11 +02:00
Geoffrey	efacfc9aa3	Add Maghreb regions and departments	2013-07-18 16:49:56 +02:00
Florian Henry	0c0a64f532	[ task #924 ] Add numbering rule on task ... [ task #925 ] Add ODT document generation for Tasks in project module	2013-07-18 10:24:45 +02:00
Florian Henry	e07eac9b17	[ task #519 ] Add category association with contacts	2013-07-16 21:04:58 +02:00
Laurent Destailleur	a4abfe1abc	New: Can add an event automatically when a projet is create.	2013-07-10 14:46:16 +02:00
Cédric Salvador	96cea7b79a	add the libname field in the migration script ... Conflicts: htdocs/install/mysql/migration/3.4.0-3.5.0.sql	2013-07-01 15:42:14 +02:00
Laurent Destailleur	17ed70230e	Bad request	2013-07-01 11:45:09 +02:00
Laurent Destailleur	1c80f35080	Fix: Avoid duplicate of old lines	2013-06-30 22:19:36 +02:00
Florian Henry	1580f92b11	Fix bug for PGSQL Migration 3.4->3.5 ... Fix bug on create invoice from contract	2013-06-27 08:09:28 +02:00
Maxime Kohlhaas	b22b604d02	Accountancy code on user object in prevision of the complete accountancy module	2013-06-25 11:14:00 +02:00
Laurent Destailleur	bc5fa5972a	Drop deprecated tables	2013-06-14 02:26:24 +02:00
Florian Henry	4f43ec0acf	Add extrafield tables	2013-06-10 14:13:44 +02:00
Laurent Destailleur	eadfa66f2c	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/core/class/infobox.class.php	2013-06-04 22:59:28 +02:00
Laurent Destailleur	b4c5114ee6	Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4	2013-06-03 19:26:01 +02:00
Laurent Destailleur	1ccde6ad04	Fix: syntax error	2013-06-03 19:25:12 +02:00
Laurent Destailleur	a1a8fac25c	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-03 11:15:15 +02:00
Laurent Destailleur	520101bdfb	Fix: Missing vat rate	2013-06-01 02:52:25 +02:00
Laurent Destailleur	b61ca887d5	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/cache.manifest htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-05-27 12:57:57 +02:00
Florian Henry	557756058f	Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 ... Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41	2013-05-25 20:58:02 +02:00
Florian Henry	c61f7b6390	Fix [ bug #911 ] Reorder intervention do not work	2013-05-25 19:48:49 +02:00
Regis Houssin	309f59fb00	Fix: wrong field name	2013-05-25 19:03:16 +02:00
Regis Houssin	b9695ddc2b	Fix: wrong field name	2013-05-25 19:02:06 +02:00
Laurent Destailleur	8fa9a60bc6	Fix: Bad field size	2013-05-25 18:12:07 +02:00
Laurent Destailleur	1bab0f9f58	Fix: Bad field size	2013-05-25 18:10:55 +02:00
fhenry	cbf29e20a2	[ task #901 ] Add Extrafeild on Fiche Inter	2013-05-18 13:00:36 +02:00
fhenry	d0b4cef7a4	Change duration _planned by planned_workload	2013-05-14 20:22:33 +02:00
fhenry	760ae88f39	[ task #531 ] Add a duration on tasks	2013-05-13 17:08:36 +02:00
Laurent Destailleur	6c4e47514d	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/holiday/fiche.php	2013-05-11 15:26:24 +02:00
fhenry	30fb1e5e05	Fix bug [ bug #885 ] silent pgsql errors with click2dial	2013-05-09 10:26:04 +02:00
fhenry	c623e7913b	Update migration script with new idx index unique name opensurvey	2013-05-07 14:31:11 +02:00
simnandez	15ede98fe7	New: [ task #877 ] Reorganize menus. Init works ... Add migration script 3.4 to 3.5	2013-05-04 01:22:09 +02:00
fhenry	8d6f959d31	Fix [ bug #864 ] fournisseur_extrafields	2013-05-01 22:57:03 +02:00
fhenry	1fc04d5b5c	Add table extrafield for commande fournisseur... ... Seems this module work as separate from order but config is missing. Try to create a new one.	2013-04-30 13:56:03 +02:00
Laurent Destailleur	9bbe5014e6	Fix: Bad field size on old installations	2013-04-28 23:50:40 +02:00
fhenry	b4f3e9d5a8	fix table name in migration script	2013-04-26 10:34:11 +02:00
fhenry	a06581771c	Reveiw extrafield for womplaiance with wiki ... http://wiki.dolibarr.org/index.php/Extrafields	2013-04-26 10:29:14 +02:00
Laurent Destailleur	203d4e3ca8	Prepare database for parameters into boxes	2013-04-23 14:17:04 +02:00
Maxime Kohlhaas	882da5d7d7	Fix : price by quantity, bad column name	2013-04-22 11:54:30 +02:00
Maxime Kohlhaas	7c01e984f8	Fix : column missing in migration for price by qty	2013-04-22 10:05:32 +02:00
Laurent Destailleur	08ae1d289b	Pgsql compatibility	2013-04-19 15:02:53 +02:00
Regis Houssin	b6bcffa4d9	Fix: missing field	2013-04-18 09:44:33 +02:00
Regis Houssin	2538a9e20e	Fix: duplicate sql request	2013-04-18 09:39:43 +02:00
Laurent Destailleur	b30c492494	Fix: pgsql upgrade	2013-04-16 16:29:21 +02:00
Laurent Destailleur	2db3bcc72e	Fix: migration 3.3.0 to 3.4.0	2013-04-15 10:00:09 +02:00
Laurent Destailleur	eead2977d9	Fix: pgsql upgrade	2013-04-14 23:15:55 +02:00
fhenry	00fb40e073	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/langs/ca_ES/admin.lang htdocs/langs/es_ES/admin.lang Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b	2013-04-14 09:40:01 +02:00
Laurent Destailleur	e5a945ba5b	Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: ChangeLog htdocs/admin/propal.php htdocs/compta/journal/purchasesjournal.php htdocs/compta/journal/sellsjournal.php htdocs/core/class/conf.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/core/modules/mailings/contacts2.modules.php htdocs/langs/ca_ES/admin.lang htdocs/langs/en_US/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/fr_FR/admin.lang htdocs/public/demo/index.php	2013-04-14 01:46:33 +02:00
fhenry	cc497490eb	[ task #814 ] Add extrafield feature into Project/project tasks module	2013-04-12 11:09:53 +02:00
Laurent Destailleur	d6d8f91dda	Fix: Rename of field not complete	2013-04-12 00:19:18 +02:00
Laurent Destailleur	fe20f8ae1b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql htdocs/install/mysql/tables/llx_expedition.key.sql htdocs/install/mysql/tables/llx_expedition.sql	2013-04-11 23:08:10 +02:00
Laurent Destailleur	891dbf5c60	Fix: Not complete renaming	2013-04-11 21:53:41 +02:00
Regis Houssin	c74fb3e3e9	Fix: remove constraint and index before rename field !!	2013-04-11 21:29:38 +02:00
Laurent Destailleur	9a29014716	New: Add color field into user table	2013-04-11 09:44:09 +02:00
Regis Houssin	b152e58793	Fix: change for experimental encyption	2013-04-10 15:42:21 +02:00
Regis Houssin	b80d4874e3	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2013-04-10 15:34:51 +02:00
Regis Houssin	057365b69e	Fix: change for experimental encryption	2013-04-10 15:33:03 +02:00
fhenry	38e30836a5	Fix bug with multicompany (SYSLOG_FILE on wrong entity)	2013-04-10 15:08:03 +02:00
Laurent Destailleur	20e9eb5f8f	Fix: syntax error	2013-04-10 10:40:59 +02:00
Laurent Destailleur	af6f075b5c	Qual: Better error management. ... Qual: Uniformize code for canvas	2013-04-09 23:56:52 +02:00
fhenry	275bf67bb7	[ task #811 ] Uniformanize note field	2013-04-09 17:18:07 +02:00
fhenry	52706117d9	Merge branch 'develop' into develop_orderextrafield	2013-04-07 23:54:33 +02:00
fhenry	393007625a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d	2013-04-07 23:52:02 +02:00
simnandez	44bfc1db4a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-04-07 15:53:31 +02:00
simnandez	9e8c3a1b1e	Updates	2013-04-07 15:45:48 +02:00
Laurent Destailleur	59dfab9d21	Fix: regresson after rename of fields	2013-04-07 15:43:21 +02:00
fhenry	78571e4458	Merge branch 'develop' into develop_orderextrafield	2013-04-07 15:12:27 +02:00
fhenry	0427080a4e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_orderextrafield Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e	2013-04-07 15:11:52 +02:00
fhenry	144ab24545	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd	2013-04-07 15:08:47 +02:00
simnandez	7b70fc4bf3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-04-07 14:30:44 +02:00
Laurent Destailleur	88858136fc	New: Enhance agenda module to reach RFC2445 (add busy information).	2013-04-06 17:39:31 +02:00
Laurent Destailleur	d863a0b1bd	Fix: syntax error	2013-04-06 16:21:34 +02:00
fhenry	48b510dd45	Same bug fixing	2013-04-06 12:42:54 +02:00
fhenry	cc465380da	Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry)	2013-04-06 12:20:19 +02:00
fhenry	b7137606ee	Merge branch 'develop' into develop_orderextrafield ... Conflicts: htdocs/commande/fiche.php htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d	2013-04-06 10:41:29 +02:00
simnandez	50548601ce	Resolve conflicts	2013-04-06 08:20:57 +02:00
Laurent Destailleur	adf47d6975	Qual: Uniformise columns	2013-04-06 00:34:33 +02:00
fhenry	dfcb38d13f	[ task #793 ] Add extrafield feature into Orders module	2013-04-05 12:43:00 +02:00
fhenry	dcd960a957	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9	2013-04-05 11:46:09 +02:00
Laurent Destailleur	58bb2df24c	Qual: Uniformize columns	2013-04-04 20:58:42 +02:00
fhenry	c109467d20	Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...	2013-04-04 13:58:33 +02:00
fhenry	ae00d8b214	Add import_key into llx_product_price	2013-04-02 15:03:01 +02:00
Grand Philippe	e2623c6ad5	try to fix :supplier invoice numbering	2013-04-01 16:04:15 +02:00
Laurent Destailleur	cc69cf7b76	New: Can defined a clicktodial setup per user	2013-03-31 16:44:24 +02:00
Grand Philippe	f57320e697	add numbering for supplier invoice	2013-03-29 15:36:54 +01:00
Laurent Destailleur	fbf8d410d2	New: Support revenue stamp onto invoices	2013-03-23 17:34:23 +01:00
Laurent Destailleur	e4ae70b5b2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-03-22 17:21:57 +01:00
Laurent Destailleur	350bcea183	Merge	2013-03-22 17:10:17 +01:00
Laurent Destailleur	2ec462dcf4	Fix: [ task #771 ] harmonize length of zipcode ... New: Add personal address for users.	2013-03-22 17:00:55 +01:00
fhenry	0215031632	[ task #122 ] Create a scheduled cron module	2013-03-22 14:45:20 +01:00
Grand Philippe	cb23777469	fix sql error	2013-03-20 22:21:22 +01:00
Laurent Destailleur	a2763df9e7	Qual: Start to clean the simple accountancy moule.	2013-03-20 21:41:16 +01:00
Laurent Destailleur	257f6da8f4	New: Add field to make accountancy dispatch module easier to build. ... Must match module customer invoice.	2013-03-20 20:34:30 +01:00
Grand Philippe	fb75358c10	fix: deprecated for expedition_methode_id	2013-03-18 17:34:29 +01:00
eldy	1d09e122c0	Some debug with pgsql	2013-03-17 14:28:57 +01:00
Grand Philippe	e1baf806b9	change birth instead of naiss	2013-03-13 22:17:03 +01:00
Laurent Destailleur	fc3483a4bb	Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/webservices/server_user.php	2013-03-12 14:55:13 +01:00
Grand Philippe	dd248e9d58	fix : dyslexia	2013-03-11 17:19:03 +01:00
jfefe	ba8525bd6a	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields ... Conflicts: htdocs/install/doctemplates/invoices/template_invoice.odt htdocs/install/doctemplates/proposals/template_proposal.odt htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-03-11 05:21:35 +01:00
Laurent Destailleur	60f16e1a88	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-03-09 19:06:53 +01:00
Laurent Destailleur	3e5ee3b00a	Fix: PHPUnit tests are back.	2013-03-09 18:55:57 +01:00
Laurent Destailleur	e03487f865	Merge pull request #724 from KreizIT/develop ... Add trigger BILL_UNVALIDATE when invoice is unvalidate	2013-03-09 09:55:29 -08:00
Cedric GROSS	d16691c856	Add trigger BILL_UNVALIDATE when invoice is unvalidate	2013-03-09 17:38:35 +01:00
Laurent Destailleur	418eeef8b4	Fix: Ton of bugs into renaming fields	2013-03-09 16:19:15 +01:00
Laurent Destailleur	01b2a6a79b	Prepare database for more localtax types.	2013-03-09 13:12:20 +01:00
Laurent Destailleur	2a67af3c94	New: when adding an action, we can define a free code to tag it for ... a specific need.	2013-03-08 12:04:01 +01:00
jfefe	1690c77aa2	Merge branch 'extra_invoice' into extrafields ... Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-03-07 01:48:27 +01:00
eldy	e74b07cbff	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql	2013-03-06 21:28:50 +01:00
eldy	05c6706727	Fix: error with pgsql	2013-03-06 20:08:38 +01:00
Grand Philippe	a080021511	fix : deprecated	2013-03-06 17:17:34 +01:00
Laurent Destailleur	d92fd0eaed	New: Add table, dictionnary and option to enable "revenue stamp".	2013-03-06 16:09:00 +01:00
Laurent Destailleur	0bfa968a3f	New: Add field to store revenue stamp	2013-03-06 15:44:06 +01:00
jfefe	49f1ef173a	Add table for invoice extrafields	2013-03-06 03:17:38 +01:00
jfefe	f335c4f306	New : add extrafield support on propal object	2013-03-04 18:22:25 +01:00
Laurent Destailleur	fc46a02573	Fix: Uniformize field type	2013-03-02 16:39:26 +01:00
fhenry	0d0c1e8c14	Fix [ bug #736 ]	2013-02-28 21:18:52 +01:00
fhenry	7952a1f1a5	rool back changes	2013-02-28 21:15:45 +01:00
fhenry	dcf76d7bcb	Fix [ bug #736 ]	2013-02-28 21:13:25 +01:00
Grand Philippe	44683a0e21	english language standardization	2013-02-27 11:58:50 +01:00
Grand Philippe	6fb6b916c7	english language standardization	2013-02-27 11:24:50 +01:00
Laurent Destailleur	6f0c35ef61	Fix: Bad migration instruct	2013-02-26 22:57:01 +01:00
Laurent Destailleur	dacba745c5	Merge pull request #694 from grandoc/develop ... english language standardization	2013-02-26 11:03:16 -08:00
Laurent Destailleur	b8a330ee80	Merge pull request #693 from atm-maxime/develop ... LDAP : update user sync + add groups sync and users associated to group ...	2013-02-26 11:02:43 -08:00
Maxime Kohlhaas	3d814c58e5	Bug # 736 : incorrect table name in migration script, muse be done in 3.3 branch too	2013-02-26 09:28:56 +01:00
philippe	905d6f7b71	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2013-02-26 08:22:48 +01:00
Laurent Destailleur	4fd8143ecc	Merge remote-tracking branch 'origin/3.3' into develop	2013-02-25 20:24:34 +01:00
Laurent Destailleur	c4948ea3db	Fix: It seems foreign key is not deleted sometimes. To be sure, we force ... delete also at end.	2013-02-25 20:23:44 +01:00
Laurent Destailleur	c44f6004dd	Doc	2013-02-25 20:17:41 +01:00
Grand Philippe	79c2e17cbb	english language standardization	2013-02-25 17:56:41 +01:00
Grand Philippe	cb28300d7e	fix error commit	2013-02-24 17:17:25 +01:00
philippe	43b01010d1	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2013-02-24 17:09:12 +01:00
Grand Philippe	86de772b31	english language standardization	2013-02-24 17:08:52 +01:00
Laurent Destailleur	7aca87ea40	Merge pull request #690 from frederic34/develop ... WIP : Carrier Admin sql data migration	2013-02-24 07:45:44 -08:00
Grand Philippe	dfae543d5e	english language standardization	2013-02-24 15:57:02 +01:00
Grand Philippe	36ce7a9a10	some fix for english language standardization	2013-02-24 14:11:09 +01:00
frederic34	2a2719d5eb	WIP : Carrier Admin sql data migration	2013-02-23 16:54:41 +01:00
Laurent Destailleur	4dbf5a20ad	Merge pull request #687 from frederic34/develop ... WIP : Admin for Carriers	2013-02-23 07:38:55 -08:00
Grand Philippe	382d216d54	english language standardization	2013-02-23 15:58:26 +01:00
Grand Philippe	b699b79a15	english language standardization	2013-02-23 15:36:12 +01:00
Grand Philippe	f862adc4d9	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop	2013-02-23 15:27:06 +01:00
Grand Philippe	a237be0d24	english language standardization	2013-02-23 15:26:39 +01:00
frederic34	9333fdb97f	WIP : Admin for Carriers	2013-02-23 15:23:33 +01:00
Laurent Destailleur	37b94e43c8	Merge pull request #685 from frederic34/develop ... WIP : Admin for Carriers	2013-02-23 03:11:52 -08:00
Grand Philippe	15f8b588d6	english standardization	2013-02-23 11:54:46 +01:00
Grand Philippe	250a941096	english standardization	2013-02-23 11:11:33 +01:00
frederic34	c8872d7e98	WIP : Admin for carriers	2013-02-23 10:20:31 +01:00
Grand Philippe	57a75d9882	english standardization	2013-02-22 17:15:49 +01:00
Grand Philippe	fb54bceafb	english standardization	2013-02-22 16:53:50 +01:00
Grand Philippe	890b9ca44a	english standardization	2013-02-22 16:27:58 +01:00
Grand Philippe	a582fd3f15	english standardization	2013-02-22 16:14:52 +01:00
Grand Philippe	fc4ad12a72	english standardization	2013-02-22 15:57:30 +01:00
frederic34	67c06225a5	WIP : Admin for carriers	2013-02-22 14:18:51 +01:00
Grand Philippe	19201a1015	english standardization	2013-02-22 11:32:19 +01:00
Grand Philippe	d255dc5114	english standardization	2013-02-22 10:24:24 +01:00
Grand Philippe	0af5c434af	english standardization	2013-02-22 09:29:34 +01:00
frederic34	de4bc7f39d	Fix : It was a bad idea to add COL in the code name of new carriers	2013-02-22 08:56:14 +01:00
frederic34	d7f83c3520	New: Add some carrier	2013-02-21 11:23:12 +01:00
Laurent Destailleur	2852aded3a	New: Add button collapse/expand for menu, category and user views.	2013-02-20 21:16:31 +01:00
Laurent Destailleur	9f8ffe242a	Fix: A text field can not have a default value	2013-02-17 16:26:06 +01:00
Laurent Destailleur	aa8413d7cb	Fix: Missing migration ... Fix: Error management	2013-02-17 16:20:49 +01:00
jfefe	14f21bc9f1	Add select list in extrafields type	2013-02-15 00:17:42 +01:00
Laurent Destailleur	caec1429b1	Fix: Uniformize database type according to page http://	2013-02-13 15:19:03 +01:00
Christophe Battarel	5c9950f486	prepare db for margin on contracts	2013-02-13 08:55:16 +01:00
Laurent Destailleur	7ee530f826	New: Add field to store hierarchy of users.	2013-01-30 15:23:49 +01:00
Laurent Destailleur	c2d334624b	Qual: Simplify system for menu manager. Only one file, one class per ... manager.	2013-01-25 17:44:23 +01:00
Laurent Destailleur	a7d41d74e8	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-23 18:09:05 +01:00
Laurent Destailleur	ec76127625	Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers ... Fix: Update member	2013-01-22 15:14:46 +01:00
eldy	5c49947750	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-20 15:32:48 +01:00
eldy	d1dc04761a	Fix: dev rule to build portable requests	2013-01-20 15:30:51 +01:00
eldy	6ded74d5dd	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2013-01-20 15:22:14 +01:00
eldy	fc011610bb	Fix: pgsql	2013-01-20 15:21:18 +01:00
Laurent Destailleur	abb6daf2dc	Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/core/boxes/box_activity.php	2013-01-19 16:29:16 +01:00
simnandez	a57f291aa2	Fix: Bad Spanish departament name	2013-01-18 09:28:54 +01:00
fhenry	e3fd60c762	Add adherent type extrafield extrafield table in migration script	2013-01-16 13:49:44 +01:00
Laurent Destailleur	ec8b260bf6	New: Prepare 3.4 branch ... New: Add hook for agenda, info and category tabs	2013-01-12 14:34:16 +01:00
simnandez	5032c48322	Fix: Bug creating invoice from a contract	2013-01-04 20:54:49 +01:00
simnandez	9a3681e6b0	Fix: Bug creating invoice from a contract	2013-01-04 16:23:15 +01:00
Marcos García	406ce9e11c	Update changelog + update deprecated triggers in database	2012-12-31 04:11:13 +01:00
Laurent Destailleur	86c9011437	Merge pull request #561 from marcosgdf/3.3 ... Updated changelog + also removed unused triggers when migrating from 3.2.X	2012-12-30 08:36:25 -08:00
Laurent Destailleur	201829e60c	Fix:[ bug #653 ] Error while creating additional attributes	2012-12-30 13:49:37 +01:00
Marcos García	99bf09dc9e	Updated changelog + also removed unused triggers when migrating from 3.2.x	2012-12-29 18:28:24 +01:00
Laurent Destailleur	d4f81a9ee7	Fix: Predefined invoice feature was broken.	2012-12-27 12:51:38 +01:00
Laurent Destailleur	e4b4f459da	Fix: Missing drop of table deprecated into 3.2	2012-12-18 10:10:04 +01:00
Laurent Destailleur	43fe5766a1	New: Holiday need to support half day to be usefull.	2012-12-10 16:10:08 +01:00
Laurent Destailleur	c44481fb91	Normalize key name	2012-12-09 18:47:23 +01:00
fhenry	0e76875e9c	prepare single login at one time	2012-12-08 18:41:32 +01:00
fhenry	4570c57bfd	Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223	2012-12-08 18:28:19 +01:00
fhenry	b3d21a4320	Fix [ bug #634 ] Install faild on PostGreSQL ... Fix [ bug #631 ] Index Creation failed on fresh install with PostgreSQL	2012-12-08 17:01:07 +01:00
Laurent Destailleur	db91526643	Fix: Solve conflict into migration/backup/restore (child tables ... must be after parent tables). Fix: Migration of old version	2012-12-08 14:16:39 +01:00
Maxime Kohlhaas	954a578ebd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-12-05 09:10:55 +01:00
Laurent Destailleur	bac4bf07a3	New: Add patch from pgrand to start link of several contacts onto an ... event	2012-12-03 20:19:35 +01:00
Laurent Destailleur	518b169a89	Increase field size (some system need to store an url here)	2012-12-02 19:41:49 +01:00
Laurent Destailleur	7b824665a5	Revert "Increase field size (some system need to store an url here)" ... This reverts commit 7ade37831e.	2012-12-02 19:41:06 +01:00
Laurent Destailleur	7ade37831e	Increase field size (some system need to store an url here)	2012-12-02 19:33:39 +01:00
Laurent Destailleur	4136c27516	RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 ... commits !	2012-12-01 15:45:05 +01:00
Maxime Kohlhaas	e45438994c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-12-01 14:36:51 +01:00
Laurent Destailleur	daacf797c4	Merge pull request #500 from cbattarel/develop ... [Task #204] more local taxes manangement	2012-12-01 02:49:45 -08:00
Laurent Destailleur	008f5fbcfc	New: extrafields are available onto users cards.	2012-11-30 15:55:59 +01:00
Laurent Destailleur	caab5ac4e0	New: Add option to be able to select onto automatic event and manual ... event (or both) into calendar view. Note: For backward compatibility reason, this will works only for new events. Qual: Disable old deprecated event code.	2012-11-28 14:47:30 +01:00
Maxime Kohlhaas	9e4cba13c8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-11-22 15:24:10 +01:00
Laurent Destailleur	66cf1419ca	Fix: llx_c_paper_format dictionnary was not up to date.	2012-11-21 17:48:27 +01:00
Regis Houssin	babda1d7df	Fix: increase field size for GB sort code (xx-xx-xx)	2012-11-20 12:43:00 +01:00
Maxime Kohlhaas	ec37a5e005	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-11-19 13:31:23 +01:00
Laurent Destailleur	6512fd90a9	New: Can export customer shipments.	2012-11-18 15:24:01 +01:00
Maxime Kohlhaas	667c8cffae	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-11-14 11:02:35 +01:00
Laurent Destailleur	7d5c4a3b38	Fix: Fix upgrade ... New: Update dump file Qual: Add label for PHPUnit tests	2012-11-11 14:34:55 +01:00
Maxime Kohlhaas	332c077d77	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-11-09 13:46:50 +01:00
Regis Houssin	40725e72a5	Fix: missing spanish localtax values update	2012-11-07 11:49:28 +01:00
Maxime Kohlhaas	5586897f70	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-11-06 23:07:40 +01:00
Laurent Destailleur	542b6f0731	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2012-11-04 19:32:30 +01:00
Laurent Destailleur	bebead8e54	Fix: To fix database integrity problems (I didn't find how ... orphelins appears, but they appears on some plateform).	2012-11-04 19:32:14 +01:00
fhenry	1f41547dc2	Set unique key index unique in db (Conform to SQL standard) and needed ... for migration to other SGBD with key.sql file	2012-11-04 15:55:12 +01:00
fhenry	be79c06c72	Set unique key index unique in db (Conform to SQL standard) and ... needed for migration to other SGBD	2012-11-04 15:21:08 +01:00
Laurent Destailleur	4d098efa38	Fix: [ bug #580 ] problème saisie du code bic/swift des coordonénes ... bancaires client	2012-11-03 03:34:49 +01:00
Maxime Kohlhaas	bed17951b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-10-27 15:59:40 +02:00
simnandez	d4df585e3c	New: More import options. Customer and suppliers categories	2012-10-26 18:34:49 +02:00
simnandez	425ebae802	New: More import options. Products categories	2012-10-26 18:19:04 +02:00
Maxime Kohlhaas	fc7bc7e5d9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-10-26 01:00:22 +02:00
Regis Houssin	48ce43d6f1	New: add export filters (thank you Charles Benke)	2012-10-25 22:30:17 +02:00
Laurent Destailleur	daeb1029a1	New: Support field required or not	2012-10-25 13:11:55 +02:00
Maxime Kohlhaas	03cf96ed31	Task # 559 : add discount by qty as done in supplier prices	2012-10-25 08:18:59 +02:00
Maxime Kohlhaas	35773d08ff	Task # 559 : mysql table creation + index and constraints	2012-10-24 17:16:03 +02:00
Maxime Kohlhaas	94c12cfb2e	Task # 559 : start of price by quantity management	2012-10-22 17:24:14 +02:00
Regis Houssin	864f038370	Fix: missing "visible" field	2012-10-22 09:24:27 +02:00
Regis Houssin	6329344df2	Fix: broken features ... Fix: use entity O for all entities	2012-10-22 09:15:08 +02:00
Laurent Destailleur	71ac3d4359	Migrate to new syslog system.	2012-10-22 01:01:10 +02:00
simnandez	aa53b7a2ba	New: More import options. Thirds Bank Accounts	2012-10-19 13:00:53 +02:00
Laurent Destailleur	33540cb2e8	Repair not synchronized denormalized field.	2012-10-17 20:22:50 +02:00
Laurent Destailleur	118ec8277b	Fix: Old data store	2012-10-14 13:27:18 +02:00
Regis Houssin	c35a1ebaf7	Fix: missing drop foreign key	2012-10-08 19:38:09 +02:00
Regis Houssin	0975918cc6	Fix: [task #146] Remove table llx_categorie_association ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-10-08 19:27:02 +02:00
simnandez	7faa90e831	New: More import options. Prepare database	2012-10-06 09:52:33 +02:00
Regis Houssin	6b21ca442d	New: add possibility to defined position/job of a user ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-10-05 12:40:19 +02:00
Maxime Kohlhaas	0e17c7c063	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186	2012-10-04 15:36:47 +02:00
Maxime Kohlhaas	12128a6226	Task # 186 : Stock calculation on product, migration + update product	2012-10-04 15:25:34 +02:00
Laurent Destailleur	bef9fd152b	Fix: table creation scripts	2012-10-02 19:42:44 +02:00
Maxime Kohlhaas	1d21f24fa7	Task # 559 : Add possibility to define a discount for min quantity on supplier product prices	2012-10-01 11:25:17 +02:00
Laurent Destailleur	9db72fb50d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2012-09-28 16:11:46 +02:00
Laurent Destailleur	e7203fa4f3	New: The discount on line for supplier invoices is now supported	2012-09-28 16:08:44 +02:00
Regis Houssin	0441c6dd46	Merge pull request #417 from aspangaro/develop ... Continue working on accountancy	2012-09-28 02:43:54 -07:00
Laurent Destailleur	49e79a2c28	Fix: database compatibility	2012-09-27 23:43:58 +02:00
Spangaro Alexandre	e4391207e4	Add new dictionnary to edit accountingsystem	2012-09-26 20:37:28 +02:00
Regis Houssin	338f0b06d9	Fix: missing changes in migration file	2012-09-25 08:06:39 +02:00
Spangaro Alexandre	ba45295c7e	Working for accountancy	2012-09-24 07:14:39 +02:00
Spangaro Alexandre	96dd6efae0	Minor fix for llx_c_tva	2012-09-24 07:14:38 +02:00
Spangaro Alexandre	a6f9111b54	Add new column in llx_c_tva	2012-09-24 07:14:37 +02:00
Laurent Destailleur	9bbe0e6b1c	Qual: Mutuamize codeby using tpl. ... New: Support unique field for extrafields	2012-09-22 20:27:06 +02:00
Laurent Destailleur	22a28abed1	Fix: Add more sql fix commands	2012-09-20 17:46:47 +02:00
Laurent Destailleur	44591bd756	Use a specific type to isolate type of event that are event ... automatically added into agenda from other predefined events.	2012-09-20 00:18:29 +02:00
simnandez	875edcad0d	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-09-19 10:32:00 +02:00
Laurent Destailleur	89dfd246d1	Init data must match migrated data	2012-09-18 18:27:10 +02:00
simnandez	fab101d2e8	Fix: Spanish localtax1 must be only applicable to products ... Add localtax2_type	2012-09-18 15:38:08 +02:00
Laurent Destailleur	df3227ef7e	Migrate spain to localtax type.	2012-09-16 16:56:24 +02:00
Laurent Destailleur	e7d3d9496c	first step for extrafield for contact/address	2012-09-14 12:15:55 +02:00
Laurent Destailleur	643d6ff3f9	Fix: Debug feature predefined invoices	2012-09-14 10:09:56 +02:00
Laurent Destailleur	4cc56f0176	New: Extra fields supports more types (now int, string, double, date, ... datetime)	2012-09-13 10:14:25 +02:00
Regis Houssin	f16a68bf01	Fix: remove unused tables	2012-09-12 16:40:46 +02:00
Regis Houssin	c6c2fd2f39	Fix: restore previous field type	2012-09-11 16:07:52 +02:00
Laurent Destailleur	4847e946a4	Fix: Use varchar instead of char (for better compatibility, char is an ... old directive) Fix: Restore usage of text field for "enabled" menu because, even if in standard code, we use 0 or 1, into external module, or menu editor we should be able to use full condition dynamic string.	2012-09-10 16:20:34 +02:00
Regis Houssin	26ff406e4a	Fix: use MODIFY instead CHANGE for just change the type of field	2012-09-10 13:25:34 +02:00
Marcos García	74b28dab79	Merge branch 'develop' into minor ... Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-09-10 12:16:45 +02:00
Regis Houssin	83179fc4f0	Merge pull request #378 from cbattarel/localtax ... prepare database for local taxes management (2nd try) - task 204 on doliforge	2012-09-10 03:04:31 -07:00
Regis Houssin	4269878e6d	Fix: restore varchar for the moment	2012-09-10 11:59:17 +02:00
Christophe Battarel	2e4aa1131a	prepare database for local taxes management ... add localtax1_type and localtax2_type in database. these type are char(1) and support following values : '0' : local tax not applied '1' : local tax apply on products and services without vat (vat is not applied on local tax) '2' : local tax apply on products and services before vat (vat is calculated on amount + localtax) '3' : local tax apply on products without vat (vat is not applied on local tax) '4' : local tax apply on products before vat (vat is calculated on amount + localtax) '5' : local tax apply on services without vat (vat is not applied on local tax) '6' : local tax apply on services before vat (vat is calculated on amount + localtax) '7' : local tax is a fix amount applied on global invoice	2012-09-10 11:00:35 +02:00
Regis Houssin	e1fcaf738f	Fix: move llx_ecm_documents in external module	2012-09-10 10:55:06 +02:00
Marcos García	45cd500882	Modified llx_menu sql and improved new menu form ... Modified `enabled` field to tinyint(1) because only holds 0 or 1 Enabled input field now made yes/no select	2012-09-10 02:09:52 +02:00
Regis Houssin	61159ca220	Fix: use specific hash for ref	2012-09-09 22:05:53 +02:00
Regis Houssin	5ff1240287	Fix: increase size for big path and where data is encrypted	2012-09-09 18:28:36 +02:00
Laurent Destailleur	1721f564c8	Increase size of field into database	2012-09-08 01:42:15 +02:00
Regis Houssin	d60211a7c8	Fix: update entity field	2012-09-07 17:43:27 +02:00
Regis Houssin	5270ec06cb	Fix: compatibility with multicompany transverse mode	2012-09-07 17:20:12 +02:00
Regis Houssin	77bbae7723	Fix: remove older models for avoid warnings	2012-09-07 11:18:08 +02:00
Regis Houssin	68c71896d4	Fix: add extraparams field for more parameters	2012-09-07 10:50:19 +02:00
Laurent Destailleur	6e90e60268	Fix data init	2012-09-06 23:46:35 +02:00
Laurent Destailleur	f9607037a7	Qual: Removed deprecated table	2012-09-05 09:58:09 +02:00
Laurent Destailleur	246f3b5bb8	New: Add the holiday module (provided by teclib with permission to add ... it by default).	2012-09-05 03:26:57 +02:00
Regis Houssin	5622d1624c	New: prepare for extend GED module	2012-09-03 18:03:39 +02:00
Regis Houssin	14b1b1d6e5	Fix: missing upgrade with minor version	2012-09-03 16:28:55 +02:00
Laurent Destailleur	2927a58606	Fix: Some fix into ajax ecm. ... New: The cache for nb of files into a dir is now implemented. By default it is "not defined" and we refresh it when making a scan of a dir for all subdirs.	2012-09-02 20:11:36 +02:00
Regis Houssin	6f8b63f0ef	Merge pull request #367 from simnandez/develop ... Fix: Bad assignation of const for pdf delivery module name	2012-09-01 09:48:57 -07:00
Regis Houssin	54acdc71f6	Fix: this field is for 3.3	2012-09-01 18:09:47 +02:00
simnandez	44a3db8785	Fix: Bad assignation of const for pdf delivery module name	2012-09-01 17:02:38 +02:00
Laurent Destailleur	96e0586934	Fix: enhance cleaning of database	2012-08-30 17:11:42 +02:00
Laurent Destailleur	4108e48d5c	Merge pull request #349 from FHenry/develop ... Change size of element type	2012-08-28 09:25:08 -07:00
Laurent Destailleur	6c0dac2f17	More things to repair	2012-08-27 19:30:09 +02:00
FHenry	d716763896	change size of elementtype	2012-08-26 21:53:40 +02:00
FHenry	7895ff0e5c	Change size of element type	2012-08-26 19:03:23 +02:00