dolibarr

Author	SHA1	Message	Date
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
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	f083ac5e6b	Prepare database to store country int accounting_system table	2017-10-23 18:56:09 +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
Laurent Destailleur	30dad0be12	Split file of chart of account to prepare to load files after install	2017-10-19 09:28:59 +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	1fba58b9ce	Fix bookmark list	2017-10-12 17:09:17 +02:00
Laurent Destailleur	56be9e2b60	Introduce table c_email_senderprofile to have several profils	2017-10-11 19:41:45 +02:00
Laurent Destailleur	ce7ce82801	Enhance email template editor	2017-10-08 14:51:10 +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	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	fef6440ff2	FIX #7541	2017-10-03 16:23:30 +02:00
Laurent Destailleur	0f194d6715	Update llx_holiday.sql	2017-10-03 16:21:44 +02:00
Frédéric FRANCE	dd76672c27	ref can be null	2017-10-03 00:30:42 +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	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
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	4f76545b62	Add missing fields to manage localtax on supplier products	2017-09-26 10:47:08 +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	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
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
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	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
Laurent Destailleur	dcc9cb4a16	Some fixes in various payment	2017-09-11 14:29:27 +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	b7197530c2	NEW Each user can edit its own email template (menu tools)	2017-09-08 12:48:01 +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	2ab12f54ff	Fix install error due to too large column with index	2017-08-31 22:42:14 +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	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	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	03eb870576	Fix sql syntax error	2017-08-26 20:16:12 +02:00
Laurent Destailleur	49a2f4f0c6	Fix sql	2017-08-26 20:13:01 +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
Regis Houssin	ad39c30c21	Fix: change old email	2017-08-23 21:23:18 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
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	927da89c89	Revert bad change	2017-08-22 11:52:34 +02:00
Laurent Destailleur	681623c3ab	Merge branch 'develop' into patch-1	2017-08-22 11:43:25 +02:00
Laurent Destailleur	188653a85d	Work on website module	2017-08-20 18:50:51 +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
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	c5267154b9	Merge branch 'develop' into Bookkeeping-V6	2017-07-25 20:54:37 +02:00
Laurent Destailleur	6c9242b605	Merge pull request #7201 from atm-florian/dev_extrafields_table_uniformisation NEW new columns into extrafields table to get update create information	2017-07-25 20:04:50 +02:00
florian HENRY	d2ecebdddd	new :new column into extrafeild table to get update create information	2017-07-25 11:57:36 +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
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	6e77dab832	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-07-18 15:13:15 +02:00
Maxime Kohlhaas	d35dbdea92	Change column size in sql table creation also	2017-07-18 10:16:59 +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	c6dcccba18	Fix better warning when record will be saved into a waiting account.	2017-07-15 14:55:04 +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	3db7bd7624	Fix look and feel v6	2017-07-13 17:44:12 +02:00
Laurent Destailleur	10337b4914	Update llx_mailing_cibles.sql	2017-07-13 14:25:42 +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
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	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	3c576dcf21	Fix bad name of tables	2017-07-09 20:57:45 +02:00
Laurent Destailleur	a562e5a919	Maxi debug of accountancy ledger page.	2017-07-08 20:52:53 +02:00
Laurent Destailleur	0a7a092080	FIX Missing ref	2017-07-07 19:17:53 +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
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Darkjeff	30153f8c2e	add in bookkeeping date lim reglement Date lim reglement for export Sage and Iris correct avoir when write in bookkeeping	2017-07-03 07:21:15 +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
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	fed5999a6c	Update doc	2017-06-24 16:57:42 +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	099ef585b2	Fix pgsql	2017-06-19 20:07:33 +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	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
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	3d5899edf3	final blockedlog init	2017-06-10 09:25:32 +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
Alexandre SPANGARO	ef9275d031	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal # Conflicts: # htdocs/core/menus/standard/eldy.lib.php	2017-06-03 07:48:50 +02:00
Alexandre SPANGARO	90c1a38486	Accountancy - Activate multijournal on bank_journal	2017-06-03 07:23:14 +02:00
florian HENRY	b0f2db7aaa	NEW : Add calculation function for Loan schedule	2017-06-02 17:48:29 +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	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	e5fe629a0e	NEW Extrafields support formulas to be computed using PHP expressions	2017-05-24 22:48:44 +02:00
Laurent Destailleur	80ce8da7a3	Fix migration errors and responsive design	2017-05-23 15:13:52 +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
absnc	7b784a1dcb	Enable shipments for project overview tab	2017-05-19 17:50:10 +11:00
Laurent Destailleur	0b0dbd9649	Code comment	2017-05-18 17:57:20 +02: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	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	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 Dinclaux	2b7dcfa56d	Add missing vat_src_code field to predefined invoices table	2017-05-09 21:07:32 +11:00
Alexandre SPANGARO	dd97bbdc82	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal	2017-05-07 15:10:30 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +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	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	b7f7683e5a	Merge pull request #6774 from aspangaro/6.0-multijournal Finish to move accountancy journals list to page like dictionnary	2017-05-05 14:21:55 +02:00
Laurent Destailleur	0bffac6dc4	Use constant vor status.	2017-05-05 13:43:43 +02:00
Laurent Destailleur	f32d19fb73	FIX #6767 serious critical error no login possible	2017-05-05 09:15:14 +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
Alexandre SPANGARO	6afd0d642a	Finish to move accountancy journals list to page like dictionnary	2017-05-01 08:16:09 +02:00
Laurent Destailleur	b57bf6460b	Start debug inventory	2017-04-30 02:34:00 +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	1c20bbb287	NEW Add index and constraints keys on supplier proposal detail table	2017-04-26 12:11:33 +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
BENKE Charlie	d60f1d8402	add price_level on product_customer_price_log fk_soc can be 0 when generic price is stored on log	2017-03-26 19:29:16 +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
BENKE Charlie	80f78e66bb	error on install	2017-03-24 15:30:46 +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	0e910616b6	Update table	2017-03-19 07:25:19 +01:00
Alexandre SPANGARO	8328c04624	2nd step : Add table	2017-03-18 08:12:29 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +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	821324868a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-27 12:15:31 +01:00
Laurent Destailleur	1f693ca586	Code comment	2017-02-27 12:07:14 +01:00
Laurent Destailleur	1ef899dacc	Prepare database to follow supplier discounts	2017-02-24 15:22:32 +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	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	13f37b2cb9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-02 02:25:49 +01:00
Laurent Destailleur	1785ef9957	Code comment	2017-02-02 00:59:07 +01:00
Laurent Destailleur	218e49298a	Uniformize field names	2017-01-31 14:10:06 +01:00
Laurent Destailleur	4cec071af5	Add tms field	2017-01-31 14:00:53 +01:00
Laurent Destailleur	fcfea4e6d1	Add missing field fk_user_modif	2017-01-27 13:26:31 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Alexis Algoud	65b956b011	NEW sql for inventory	2017-01-09 10:33:33 +01:00
Gustavo Novaro	3e77fed815	Fix missing ,	2017-01-08 01:59:04 -03: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	febd23fe41	Clean dead code	2017-01-03 11:22:03 +01:00
Laurent Destailleur	728dd3f7b3	Add field ref into ecm_files table.	2017-01-03 11:06:24 +01:00
Laurent Destailleur	c27a1c1705	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-03 01:34:46 +01:00
Laurent Destailleur	7dc55daf38	FIX #6229	2017-01-02 14:37:07 +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
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	e1a5a90f0a	NEW Uploaded files are indexed into database	2016-12-13 00:15:21 +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	495ba00cb6	Fix: Slurp, database corruption due to missing unique key on main key.	2016-12-02 14:21:46 +01:00
Laurent Destailleur	0ec9dd9b88	Merge pull request #6048 from ozit/patch-1 an extra comma at the end	2016-11-29 23:37:41 +01:00
Laurent Destailleur	83972b39ce	Complete work on dol_banner. Fix errors due to missing columns.	2016-11-28 23:58:36 +01:00
Oziel AO	2c8f2f220a	an extra comma at the end note text not note text,	2016-11-28 12:29:30 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	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
aspangaro	137561aec9	Merge remote-tracking branch 'Upstream/develop' into 5.0-p35	2016-11-12 06:31:06 +01:00
BENKE Charlie	eda718a91b	Update llx_facturedet.sql	2016-11-11 15:25:19 +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
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
aspangaro	5ed79800e0	Begin to wok on Vat expense report integration in reports	2016-11-05 07:48:42 +01:00
Laurent Destailleur	3fbba59f69	Better management of status of events	2016-10-30 13:12:35 +01:00
Laurent Destailleur	cb3f0dadab	NEW Can see/edit the customer ref of a shipment	2016-10-29 14:52:13 +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	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	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	30e6dd93a6	Missing perf key on the most important table	2016-10-15 17:10:05 +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	416311a7b9	NEW : allow to save a parent warehouse # Conflicts: # htdocs/product/stock/card.php	2016-10-14 11:29:14 +02:00
Bruno Généré	966b31de0f	Bug Fix : issue with commas in the SQL script.	2016-10-11 11:35:06 +02:00
Laurent Destailleur	77e87b3c07	NEW Add tooltip in payment term edition in dictionnary	2016-10-07 00:37:06 +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	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +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	b35a4eb1b2	Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month	2016-10-04 16:01:26 +02:00
gauthier	1c98979ca1	NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month	2016-10-04 15:45:23 +02:00
Laurent Destailleur	3599f2c840	Uniformize code for recurring invoices	2016-10-04 12:31:45 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +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
Laurent Destailleur	b412baa880	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-29 10:49:47 +02:00
Laurent Destailleur	ccd7100b7f	Minor code fix	2016-09-29 10:43:53 +02:00
Laurent Destailleur	8fc857fdcb	Missing entity in the bookkeeping table	2016-09-29 10:10:32 +02:00
Laurent Destailleur	e99f115a8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/tables/llx_user.sql	2016-09-28 19:49:36 +02:00
Laurent Destailleur	2d6877ac67	Add tables to store working employee contracts	2016-09-28 19:33:51 +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	a0ec91cb94	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse	2016-09-20 12:03:55 +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
gauthier	7a0577ccfc	NEW : add limit stock product by warehouse	2016-09-16 17:09:38 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
phf	bd734de437	Fix bad query	2016-09-12 09:52:35 +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	7917169961	Fix miss entity column in llx_multicurrency_rate	2016-09-08 14:53:59 +02:00
florian HENRY	abda9146f1	FIX : cannot add order line (if fk column is not in user they whould be NULL by defaut.	2016-09-07 11:32:45 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
Laurent Destailleur	898bbd6031	NEW Support extrafields for expense reports	2016-09-06 13:00:32 +02:00
Laurent Destailleur	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	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	4a2b7e1bba	add link to commande fourn if resplenish	2016-08-23 11:25:14 +02:00
BENKE Charlie	5f587efc72	Update llx_facturedet.sql	2016-08-17 16:36:22 +02:00
Laurent Destailleur	15a40f6401	Fix default value of entity	2016-08-11 15:50:18 +02:00
Laurent Destailleur	f1ee2bdddf	Remove deprecated field	2016-08-09 13:10:34 +02:00
Laurent Destailleur	54b47d7f4f	Fix edit of page in module website Conflicts: htdocs/websites/class/website.class.php	2016-08-08 19:09:37 +02:00
BENKE Charlie	908bf50e69	new : add user id on line for tracking feature	2016-08-07 14:16:56 +02:00
Laurent Destailleur	f54946bacb	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql	2016-07-28 10:10:58 +02:00
Laurent Destailleur	2a28d77eeb	FIX #5465 - Fix type account_parent	2016-07-27 19:53:16 +02:00
Regis Houssin	4b8f42949c	# WARNING: head commit changed in the meantime Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670	2016-07-25 21:05:11 +02:00
Marcos García de La Fuente	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	af09528738	NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and __AMOUNT_WO_TAX__ into emails templates.	2016-07-21 20:45:30 +02:00
Laurent Destailleur	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	038526bb71	Code comment	2016-07-18 14:40: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	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
frederic34	f25ff0581c	sql changes	2016-07-15 10:07:02 +02:00
Laurent Destailleur	ec6640af63	Add field virtualhost for website module	2016-07-14 15:54:46 +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
Raphaël Doursenaud	eb54c3f8af	Fix #5350 date_pointoftax prevented creating invoices	2016-06-16 13:09:11 +02:00
Laurent Destailleur	6034ba658c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2016-06-10 18:59:05 +02:00
Laurent Destailleur	09270aa8bd	Not used table	2016-06-09 07:27:24 +02:00
Laurent Destailleur	47308d27c3	Missing column import_key and import for vat payments	2016-06-06 14:37:06 +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	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
Florian HENRY	3c42a32690	FIX: #5151	2016-05-31 23:22:15 +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	27da82df1f	FIX Missing columns in migration	2016-05-26 21:20:10 +02:00
Laurent Destailleur	9a3251bcc9	FIX Missing columns in migration	2016-05-26 21:18:08 +02:00
Laurent Destailleur	db56e1b8a1	FIX Missing columns in migration	2016-05-26 21:17:43 +02:00
Laurent Destailleur	a36b780c53	Fix phpunit	2016-05-17 20:30:04 +02:00
Laurent Destailleur	3b99fb01ee	Fix duplicate table	2016-05-17 10:51:03 +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	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	aa55cdadac	Merge pull request #4944 from FHenry/develop_advtargetemailiing NEW : Advance target emailing	2016-05-05 23:18:27 +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
Florian HENRY	3d57e83094	Merge branch 'develop' into develop_advtargetemailiing Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-05-02 20:40:42 +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
Laurent Destailleur	bcb4b2b607	Work on website module	2016-04-23 21:34:10 +02:00
aspangaro	1454f5cafa	FIX: Accountancy - Table account integer 0 by default	2016-04-23 15:44:31 +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
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
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +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	b1c2198154	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/ajax/selectsearchbox.php htdocs/core/lib/price.lib.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/modCommande.class.php htdocs/core/modules/modFacture.class.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-07 20:01:52 +02:00
Alexis Algoud	c2a5ad7d9c	FIX sql	2016-04-06 10:05:03 +02:00
Laurent Destailleur	e7adae13ca	Code comment	2016-04-05 12:59:17 +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
Florian HENRY	344a87f970	Merge branch 'develop' into develop_advtargetemailiing Conflicts: htdocs/admin/dict.php htdocs/core/class/html.formaccounting.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-04-04 14:43:17 +02:00
Laurent Destailleur	f3c032ba21	Merge pull request #4925 from frederic34/patch-9 Update llx_propal_merge_pdf_product.sql	2016-04-04 00:34:40 +02:00
Laurent Destailleur	bd4bdcea37	Merge pull request #4924 from frederic34/patch-8 FIX Remove sql error when creating table llx_usergroup_extrafields.sql	2016-04-04 00:33:23 +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
Florian HENRY	ae51321040	Debug Advance target emailing	2016-04-01 14:30:02 +02:00
Florian HENRY	081c7824d2	FIX : range is MySQL reserved word, cannot be used as column names	2016-04-01 14:00:14 +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
Frédéric FRANCE	90e74b346e	Update llx_propal_merge_pdf_product.sql No need IF NOT EXISTS at install time	2016-03-31 17:13:38 +02:00
Frédéric FRANCE	125256c825	Update llx_usergroup_extrafields.sql No need IF NOT EXISTS at install time	2016-03-31 17:11:17 +02:00
Frédéric FRANCE	1419b0e385	Update llx_establishment.sql	2016-03-31 17:06:10 +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	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
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	d663b28dac	Fix no database structure change is allowed into minor versions	2016-03-10 13:49:13 +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
Regis Houssin	25686e82c9	Fix: best compatibility with multicompany and others security issue	2016-03-03 08:49:24 +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	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
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	0a02d58afb	Merge pull request #4656 from defrance/patch-104 Add model_pdf fields for edition feature on product	2016-02-20 02:29:58 +01:00
Laurent Destailleur	f8956f785d	Fix syntax error	2016-02-19 16:12:39 +01:00
Laurent Destailleur	6ab8ba1cb1	Fix sql error	2016-02-19 16:10:14 +01:00
BENKE Charlie	8f866254ac	add model_pdf fields for edition feature	2016-02-19 15:47:37 +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	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	b21b5e7bb8	Create llx_categorie_user.key.sql	2016-02-13 10:51:24 +01:00
BENKE Charlie	e3444e08a7	Create llx_categorie_user.sql	2016-02-13 10:50:46 +01:00
Laurent Destailleur	d0ab1db19b	NEW When emailing is not sent completely, show progression	2016-02-12 14:21:44 +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
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
Laurent Destailleur	2e1011ca0c	Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that seems useless.	2016-02-06 12:29:02 +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	cc8af4fba1	Update llx_element_resources.sql	2016-02-02 18:05:24 +01:00
Laurent Destailleur	1fb1da5be4	Work on website module	2016-02-02 16:24:12 +01:00
PeartreeG	f6dc4757d0	add fields for resource tracking	2016-01-31 18:13:14 +01:00
Laurent Destailleur	928336c835	NEW Clean and enhance code for cron engine	2016-01-31 15:14:50 +01:00
PeartreeG	b47065862a	Update llx_resource.sql	2016-01-31 12:38:05 +01:00
PeartreeG	91e46b1d35	add somes fields on resource	2016-01-31 12:37:03 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
Laurent Destailleur	274caf61eb	NEW Add statistics for interventions module	2016-01-25 13:34:05 +01:00
Laurent Destailleur	467dc12a7b	NEW Module "Supplier commercial proposal" (price request) is set to stable status.	2016-01-25 12:33:38 +01:00
Laurent Destailleur	d65229998b	Work on website module	2016-01-25 10:25:52 +01:00
Laurent Destailleur	8d46a56dac	Work on CMS module	2016-01-24 21:17:11 +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	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
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
Laurent Destailleur	a4edd90320	Debug the cron module	2015-12-19 03:27:55 +01:00
Laurent Destailleur	a973c91c24	Fix pagination on cron jobs Fix perf when too much lines	2015-12-19 02:39:44 +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	85344aa955	Update llx_fichinter.sql	2015-12-15 11:46:56 +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
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
aspangaro	c30728326e	Merge remote-tracking branch 'Upstream/develop' into develop-bank	2015-12-04 12:41:51 +01:00
BENKE Charlie	2c95344f05	Add date start and end of intervention	2015-12-04 11:09:05 +01:00
Laurent Destailleur	2f02919c70	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-03 10:01:51 +01:00
Laurent Destailleur	c664a492e6	Removed a not used field making mysql error (reserved word). Also this field is not required by dolibarr core.	2015-12-03 10:01:40 +01:00
aspangaro	09a6cc9625	wrong table	2015-12-01 20:17:14 +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	e438d76df9	NEW Option encrypt password into databae is set to on by default on first install.	2015-11-22 11:32:31 +01:00
Laurent Destailleur	2eba3c9e81	Comment	2015-11-21 02:39:49 +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	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
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +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
Frédéric FRANCE	bd7687b6ab	Update llx_accounting_account.key.sql	2015-11-12 17:47:08 +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	6ec33a94c6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-08 15:39:10 +01:00
Laurent Destailleur	bd56396394	Fix migration error	2015-11-08 15:38:57 +01:00
Juanjo Menent	a02100e3c7	Merge pull request #3924 from atm-gauthier/develop_fix_script_creation FIX : wrong coma in llx_opensurvey_sondage.sql creation script	2015-11-08 11:03:26 +01:00
Laurent Destailleur	fa8863d2ea	Fix sql migration requests	2015-11-08 01:38:03 +01:00
Laurent Destailleur	439e4a483d	Doc comment	2015-11-07 12:37:05 +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
Gauthier	ef3c7f927e	FIX : wrong coma in llx_opensurvey_sondage.sql creation script	2015-11-06 16:38:26 +01:00
Laurent Destailleur	0433f20354	Code comment	2015-11-05 22:20:31 +01:00
Laurent Destailleur	81f0b516b9	Prepare module opensurvey for 'Form' type.	2015-11-04 11:08:46 +01:00
Marcos Garcí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
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 Garcí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
Laurent Destailleur	24c3491ff7	Code comment	2015-10-26 22:56:54 +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
Sergio Sanchis Climent	2a412af00b	Fix: Bug: if $this->employe no exist Fix: if this->employee no exist default 0	2015-10-23 13:04:33 +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	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	1d9f9c7f5b	Update llx_commande.sql	2015-10-19 21:00:47 +02:00
Frédéric FRANCE	2264ecfb2c	Update llx_commande.sql	2015-10-19 20:58:36 +02:00
Laurent Destailleur	ec04306348	Fix #3772 Test lower value to avoid mysql limit	2015-10-19 18:31:38 +02:00
Marcos Garcí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	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	92f4c0d015	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-10-03 16:01:24 +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	920803518f	Removed not used table	2015-10-02 16:31:34 +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
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	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	710e9327bf	Update works	2015-09-07 21:42:12 +02:00
Laurent Destailleur	77ef046af4	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:02:21 +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
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
Laurent Destailleur	ba67cf9fa6	Update doc	2015-08-13 00:51:32 +02:00
Laurent Destailleur	fc9dc100b1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-08-12 22:13:19 +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
Juanjo Menent	78d1dfae11	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-12 18:41:44 +02:00
josemariagomezroncero	e146af3118	Update llx_c_type_resource.sql Error create table, missing incremet type element	2015-08-11 22:38:21 +02:00
Laurent Destailleur	84e45848c8	Doc comments	2015-07-30 14:44:05 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
BENKE Charlie	fc8daef78d	increase size of libellé if we use paypal and email in case of long email the field is to small	2015-07-06 17:46:36 +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	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
Laurent Destailleur	8b4e3096a6	Merge pull request #2412 from marcosgdf/commercial-name NEW [ task #851 ] Add a new field: Commercial name	2015-06-16 11:44:03 +02:00
aspangaro	a23994055a	Add field and table in database & migration script	2015-06-16 05:47:19 +02:00
Marcos García de La Fuente	a496606826	Merge branch 'develop' into commercial-name Conflicts: htdocs/societe/soc.php	2015-06-13 02:45:42 +02:00
Raphaël Doursenaud	3f2b543ae4	Fix #2899 : Reintroduce missing field	2015-06-11 10:53:40 +02:00
Laurent Destailleur	5edef2f02f	NEW A module can add its entries into cron module.	2015-06-05 03:32:09 +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	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 Garcí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
Raphaël Doursenaud	38a9f6edae	Drop deprecated fields Fix #2870	2015-05-21 16:32:46 +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
Marcos Garcí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	74607218ea	Fight against key tva_taux. Removed completely.	2015-05-14 15:59:09 +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 Garcí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	125c821bc4	add comment	2015-04-24 20:47:45 +02:00
Laurent Destailleur	5b758e0e16	Fix migration process	2015-04-22 00:17:03 +02:00
Laurent Destailleur	96a33bbe8a	First clean of code after devcamp	2015-04-21 15:49:58 +02:00
Marcos García de La Fuente	7be7a770c1	Implemented units for CommandeFournisseur and FactureFournisseur	2015-04-19 16:46:24 +02:00
Marcos Garcí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 Garcí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
Florian HENRY	11e1d0310c	typo	2015-04-18 23:00:22 +02:00
Florian HENRY	f2018b7946	fix bug #2652	2015-04-18 22:59:20 +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 Garcí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	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	c25872b182	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-10 10:21:10 +02:00
Laurent Destailleur	2b071a6091	NEW: For a contract line, price is no more mandatory.	2015-04-10 10:17:20 +02:00
Laurent Destailleur	e3bbbaf2e1	Comments	2015-04-08 20:52:18 +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
aspangaro	ca82c2f36d	Merge remote-tracking branch 'Upstream/develop' into develop-adherent	2015-04-06 07:53:04 +02:00
Marcos Garcí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
Laurent Destailleur	e827b1b9cd	Merge pull request #2529 from aspangaro/develop-don NEW better integration in project for donation module	2015-04-02 11:42:15 +02:00
Laurent Destailleur	10f967e07a	FIX #2519	2015-04-02 11:11:03 +02:00
Laurent Destailleur	29fc2652e1	FIX #2519	2015-04-02 11:00:37 +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
Marcos Garcí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	059bb40345	Debug	2015-03-26 20:43:34 +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	15e50ed24f	Update works	2015-03-21 06:21:34 +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
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 Garcí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
Laurent Destailleur	c06ff8acd9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-14 14:30:09 +01:00
Laurent Destailleur	44d6bdb1c5	Doc	2015-03-14 14:27:45 +01:00
Laurent Destailleur	c45ec24958	Merge pull request #2379 from atm-maxime/develop New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order	2015-03-14 14:08:38 +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
Maxime Kohlhaas	3578ca8baa	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-03-11 08:52:09 +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
Maxime Kohlhaas	fa628bba6f	Fix SQL error when installing	2015-03-10 15:34:48 +01:00
Maxime Kohlhaas	6113a5b0f5	FIX : [bug #1883 ] missing field in SQL installation	2015-03-10 15:27:36 +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	5c36db06f6	Add missing files	2015-03-04 23:04:37 +01:00
Laurent Destailleur	f570cd6b42	Forgot to commit tables	2015-03-04 20:35:08 +01:00
Laurent Destailleur	5335a6affa	NEW: Add close date and user for projects.	2015-03-04 16:28:29 +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
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
Marcos Garcí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 Garcí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
aspangaro	4803a1fb89	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-25 06:59:27 +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	5dffe4b440	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-21 12:58:14 +01:00
Laurent Destailleur	070accd1e0	Work on new module expense report	2015-02-21 12:57:17 +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	a05e39f119	Merge pull request #2356 from KreizIT/fix_sqldata Fix inconsistent data	2015-02-18 23:31:22 +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	ad67fe50a3	Correct management when delivery date is universal time format.	2015-02-17 17:21:41 +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
KreizIT	674585136e	Fix inconsistent data	2015-02-14 16:18:18 +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
Laurent Destailleur	b9d2de99e1	Translation	2015-02-11 14:46:16 +01:00
Laurent Destailleur	ef31ca9b84	New: Add balance of each account statement.	2015-02-07 23:32:46 +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
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
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	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
cla	134759ce28	update table name facture_fourn_det_extrafields	2015-01-22 15:02:19 +01:00
cla	c8480efbef	update table name facture fourn det extrafields	2015-01-22 15:01:27 +01:00
cla	c953a04687	Added files for Extrafields in Order/Invoice Supplier Line. New files sql added in install/mysql folder and 2 new pages to insert extrafields in admin folder	2015-01-22 14:18:33 +01:00
Laurent Destailleur	fdaa930507	Solve phpunit. Fix database field format	2015-01-19 01:58:48 +01:00
Laurent Destailleur	e220ce5a82	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php	2015-01-18 18:44:22 +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	19dbf7e2c6	Merge pull request #2185 from marcosgdf/bug-1765 Fix: [ bug #1765 ] Unable to create a contract	2015-01-18 12:39:25 +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	30abacd0a6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-01-17 14:42:42 +01:00
Laurent Destailleur	87a59ef527	Merge branch 'develop_bank_extrafields' of https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields Conflicts: htdocs/admin/bank.php	2015-01-17 14:42:04 +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	3794c9305e	Fix: [ bug #1754 ] Error while installing 3.7	2015-01-06 00:04:23 +01:00
Marcos García de La Fuente	98ed747671	Fix: [ bug #1765 ] Unable to create a contract	2014-12-28 17:17:08 +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
Marcos García de La Fuente	745eece5fe	Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL	2014-12-26 00:34:57 +01:00
frederic34	3bf63ed0a9	Merge remote branch 'upstream/develop' into printipp	2014-12-21 14:59:37 +01:00
Laurent Destailleur	711b033844	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contrat/card.php htdocs/core/class/html.form.class.php htdocs/product/stock/card.php	2014-12-14 12:35:13 +01:00
Laurent Destailleur	9be99b2987	Fixed: We must use PMP of product. Not warehouse.	2014-12-09 14:27:02 +01:00
frederic34	9bb1999dc2	Some correct	2014-12-08 21:07:24 +01: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	a59ac280bc	Doxygen	2014-12-07 02:19:57 +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	671243e8f6	Fixed: Bugs reported by scrutinizer Fixed: Solve conflict between ->iban and ->iban_prefix.	2014-11-22 16:57:08 +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
BENKE Charles	38c2dc8747	Update llx_facture_fourn.sql increase ref fields size (like customers facture)	2014-11-13 11:16:40 +01:00
BENKE Charles	0a1f5eff41	Update llx_commande_fournisseur.sql extend ref fields size (like for customer commande)	2014-11-13 11:15:24 +01:00
BENKE Charles	0131acd930	Update llx_commande_fournisseur.sql increase size of ref supplier (some supplier are very long ref...)	2014-11-13 11:06:21 +01:00
Florian HENRY	e9f754395d	Start bank extrafields	2014-11-10 13:09:58 +01:00
aspangaro	3042bf4dc2	Correct lot of bugs	2014-11-10 06:08:50 +01:00
aspangaro	840dfd780d	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-07 21:28:39 +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
aspangaro	cbfa90abca	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 20:57:05 +01:00
Andrelec1	c9c499717b	Fix bad comma	2014-11-04 14:56:18 +01:00
Andrelec1	6837ff730b	Fix missing comma	2014-11-04 14:41:56 +01:00
aspangaro	25433120e6	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 06:16:03 +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	9d9a1e0701	Merge pull request #1974 from grandoc/develop encrease name length for societe	2014-10-30 18:04:38 +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
Philippe GRAND	19e194dd81	encrease name length for societe	2014-10-23 12:01:15 +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
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	e76b5a370d	Fix: bad parameter	2014-10-09 17:27:14 +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
Regis Houssin	f233d4f610	New: add doc models management in contract module	2014-09-28 20:39:02 +02:00
aspangaro	250b57ca0a	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-09-28 14:00:26 +02:00
Laurent Destailleur	c2cbbffd12	Fix: duplicate field	2014-09-24 17:30:49 +02:00
aspangaro	a58025c601	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-09-23 21:24:29 +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
Alexis Algoud	de0d53a2bb	ADD extrafields on usergroup	2014-09-22 16:31:58 +02:00
aspangaro	08b9e05425	New Module : Manage Financial Loan	2014-09-21 17:42:38 +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	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
aspangaro	7cc3fe9c95	Merge remote-tracking branch 'Upstream/develop' into develop-accounting	2014-09-09 20:41:19 +02:00
Laurent Destailleur	27ba1680bf	Add field weeklyhours.	2014-09-09 15:29:54 +02:00
Laurent Destailleur	9f2b0b4f29	Minor enhancement on agenda module. Can filter on date of event. Local calendar renamed into Internal calendar.	2014-09-09 12:28:35 +02:00
aspangaro	02f45b7f43	Merge remote-tracking branch 'Upstream/develop' into develop-accounting	2014-09-07 07:32:47 +02:00
aspangaro	f9dc25cf3f	Patch Accounting Expert Module	2014-09-06 09:50:42 +02:00
Laurent Destailleur	a93ad958ac	New: Add help info of field type into dictionary of payment types.	2014-09-05 09:33:12 +02:00
aspangaro	bb7aa9f29c	Merge branch 'Upstream/develop'	2014-08-29 06:33:00 +02:00
Laurent Destailleur	22fb37f856	Fix: Sql syntax for extrafield table of interventions	2014-08-28 15:00:09 +02:00
aspangaro	71265558d2	Integrate module Accounting Expert	2014-08-27 07:03:42 +02:00
aspangaro	cd5d3f5368	Fix :: Sql problem on resource table	2014-08-22 07:19:14 +02:00
aspangaro	2aa3995b73	Fix :: Sql problem for fresh install on resource table // Ok in migration script	2014-08-21 06:01:47 +02:00
aspangaro	f774ff487b	Merge branch 'Upstream/develop'	2014-08-18 11:56:49 +02:00
Laurent Destailleur	cf80f97b95	Fix: bad table name	2014-08-17 17:47:45 +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
Laurent Destailleur	37cc0dc4f3	Perf: Add missing index on projet_task_time table.	2014-08-15 01:32:18 +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	2169a8668d	Fix: PHPCS	2014-08-06 09:18:44 +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	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	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	51f1577c84	Fix: Field for user into event is "owner".	2014-08-03 23:32:36 +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	1e09200347	Prepare to add foreign key toward parent into table llx_accountingaccount.	2014-07-31 20:49:50 +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
Marcos Garcí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
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	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	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	932206a152	Fix: phpunit	2014-07-08 21:04:17 +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	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	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
Juanjo Menent	72243d4f38	fix: Timestamp with default null	2014-07-04 12:32:57 +02:00
aspangaro	a2ac578712	Merge branch 'Upstream/develop'	2014-07-04 06:21:00 +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 García de La Fuente	e351657cc0	Removed key restrictions	2014-07-03 10:16:37 +02:00
Marcos Garcí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	46320071a0	Merge branch 'Upstream/develop'	2014-06-29 05:42:37 +02:00
aspangaro	56785f1149	Merge branch 'Upstream/develop'	2014-06-24 06:10:47 +02:00
aspangaro	865d853af8	Add migration file to 3.7 & update llx_c_paiement	2014-06-24 06:02:17 +02:00
aspangaro	67f05515d9	Add accountancy_code into llx_c_paiement	2014-06-03 06:19:24 +02:00
Laurent Destailleur	4060dfe8f2	Code comment to remind goal of field.	2014-05-30 11:46:16 +02:00
aspangaro	dce9c2bc76	Fiscal year - 1st step	2014-05-28 05:34:10 +02:00
Jean-François Ferry	1d929d267c	Move table creation instruction into migration tables	2014-05-10 22:07:12 +02:00
Jean-François Ferry	03f0851e7d	Add database tables for resource module	2014-05-10 22:06:23 +02:00
Jean-François Ferry	6c75a0cb11	Add database tables for resource module	2014-05-10 22:06:22 +02:00
Jean-François Ferry	d9c567ca3d	Prepare structure for upstream merge	2014-05-10 22:03:05 +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	d25778f12b	Qual: Removed duplicate column "datea" into table llx_societe (duplicated with column tms).	2014-05-04 16:59:13 +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	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	55c2659952	Fix: sql syntax error	2014-04-13 02:02:26 +02:00
Laurent Destailleur	f027482b51	Merge pull request #1513 from KreizIT/fixtablestruct Fix installation script link to Task 1074 (missing new field)	2014-03-27 16:06:51 +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
KreizIT	5c837583c3	Fix installation script link to Task 1074 (missing new field)	2014-03-26 16:58:43 +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	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	a574997191	Qual: Add unique keys constraints on barcode.	2014-03-17 20:52:06 +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
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	048b3c01ce	Add salary payment in tax module - Link to user. Necessary for future hrm module.	2014-03-06 21:21:16 +01:00
Laurent Destailleur	cd3e56a2d0	Merge pull request #1450 from grandoc/develop fix english misspelling	2014-03-06 18:23:51 +01:00
Laurent Destailleur	e9adec49eb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-03-05 11:22:12 +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
philippe	e2b29bb108	fix english misspelling	2014-03-05 09:57:36 +01:00
KreizIT	7f275dfbf4	- Add table modification for product (forget in step 1) - Add module for batch number management - change dependency for stock and product - change product class and fiche showing new select for batch managment on product	2014-03-04 18:55:55 +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	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	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
Laurent Destailleur	7c01fd98b3	Fix: use allowed database types	2014-01-28 15:45:00 +01:00
Marcos García de La Fuente	c245e86b60	Little changes to the opensurvey_sondage table definition	2014-01-06 05:17:02 +01:00
Marcos García de La Fuente	c2c97ec82a	Mailsonde should not be a varchar	2014-01-06 05:12:47 +01:00
Marcos Garcí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 Garcí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 García de La Fuente	c9db0c3a94	Removed “stupid” feature to allow voters edit other users’ vote	2014-01-04 19:51:44 +01:00
Marcos García de La Fuente	13d4ea4c38	Added a new feature to disable spying other users’ vote	2014-01-03 23:30:15 +01:00
Marcos Garcí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 García de La Fuente	a5b9122e98	Allow to disable poll comments	2014-01-03 17:44:42 +01:00
BENKE Charles	e9ef9b6e8d	Update llx_projet_task.sql new field "ref" present on update sql but not on the table	2013-12-25 15:02:21 +01:00
Raphaël Doursenaud	071dd8e758	Make bookmarks module multicompany aware	2013-12-10 12:00:42 +01:00
Laurent Destailleur	3c0c9019b5	Comment	2013-12-08 15:40:22 +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	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
Peter Fontaine	b965103fc3	Multiple Bank Account Number for Third Party	2013-11-13 15:40:17 +01:00
Raphaël Doursenaud	be30cb8cbf	Removed unused tables from installer Fixes installer bug	2013-11-07 15:57:24 +01:00
Laurent Destailleur	b2308ba65c	Merge pull request #1284 from GPCsolutions/links Links	2013-11-06 17:15:49 -08:00
Laurent Destailleur	51ad76b6de	fix: minor syntax rules	2013-11-06 12:53:43 +01:00
Cédric Salvador	ae8fea2615	new attributes	2013-11-06 10:17:18 +01:00
Cédric Salvador	06af0733e9	rename parameter to rowid	2013-11-06 10:11:40 +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	f727e832d9	Add mandatory and transparent into llx_actioncomm_ressource	2013-11-02 02:25:06 +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	f512ef344a	Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used	2013-10-30 12:24:51 +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	f87afaac10	Suggest a better page name	2013-10-19 14:38:49 +02:00
Laurent Destailleur	7b53ad5580	Fix: Missing field required by update_price	2013-10-18 01:09:41 +02:00
Laurent Destailleur	fa1e56b976	Code comment	2013-10-15 15:17:33 +02:00
BENKE Charles	bafea2c4eb	Rename contrat_extrafields.sql to llx_contrat_extrafields.sql	2013-10-09 18:17:59 +02:00
BENKE Charles	943bb2afc7	Create llx_contrat_extrafields.key.sql add contrat extrafields key file	2013-10-09 18:16:56 +02:00
BENKE Charles	637417e1d4	Create contrat_extrafields.sql	2013-10-09 18:14:19 +02:00
BENKE Charles	6b909746f4	Update llx_societe.sql	2013-10-06 17:14:14 +02:00
Laurent Destailleur	2ffb16b99d	Fix: permissions on files.	2013-10-02 23:48:13 +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
simnandez	7f21e596dd	[ task #1063 ] Allow edit localtaxes rate for thirds. Init Works	2013-09-17 17:17:59 +02:00
BENKE Charles	1f503948a8	Update llx_societe.sql add outstanding value	2013-09-17 10:15:24 +02:00
Raphaël Doursenaud	3c08ca5b71	Fixed SQL install script for PostgreSQL	2013-09-11 17:12:51 +02:00
Laurent Destailleur	edaeaf3803	Fix: field is not mandatory	2013-09-08 00:23:32 +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
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	6927274d2a	copyright	2013-07-29 12:31:05 +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
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	5329312dd3	Add table	2013-07-16 21:26:19 +02:00
Cédric Salvador	edc5de4f24	indentation	2013-07-01 15:42:14 +02:00
Cédric Salvador	aa4f2ba8fb	made it possible to call a function from a library Conflicts: htdocs/install/mysql/tables/llx_cronjob.sql scripts/cron/cron_run_jobs.php	2013-07-01 15:41:27 +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
Maxime Kohlhaas	109d1a71cb	Merge	2013-06-25 11:00:48 +02:00
Regis Houssin	930f6e4850	Fix: avoid error with crlf	2013-06-24 18:04:06 +02:00
Laurent Destailleur	7778a17a89	Qual: clean code from deprecated vars	2013-06-24 16:41:31 +02:00
Florian Henry	4f43ec0acf	Add extrafield tables	2013-06-10 14:13:44 +02:00
Laurent Destailleur	4654e811b2	Close taks [ task #645 ]. We keep fields, just add comment into tables with explanation of fields.	2013-06-06 18:54:17 +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
fhenry	b3f40b900b	Make constraint SQL unique name (Mandatory for PgSQL)	2013-05-07 09:26:31 +02:00
fhenry	9038549d0d	fix margin calculation problem	2013-05-03 11:50:13 +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	203d4e3ca8	Prepare database for parameters into boxes	2013-04-23 14:17:04 +02:00
Laurent Destailleur	bb3f40a1bf	Qual: Clean code to be able to update combo box when removing a box. Qual: Opensurvey tables	2013-04-19 15:26:53 +02:00
Laurent Destailleur	570e4391a5	Fix: Box with product out of stocks for pgsql	2013-04-19 14:51:39 +02:00
Regis Houssin	b6bcffa4d9	Fix: missing field	2013-04-18 09:44:33 +02:00
fhenry	8f8dce19cc	Task Project Extrafield : Forget to add to index tables	2013-04-15 12:38:27 +02:00
Laurent Destailleur	d6d8f91dda	Fix: Rename of field not complete	2013-04-12 00:19:18 +02:00
Laurent Destailleur	891dbf5c60	Fix: Not complete renaming	2013-04-11 21:53:41 +02:00
Laurent Destailleur	750b30863f	Qual: Clean code from things that should be inside external module.	2013-04-11 09:15:41 +02:00
Laurent Destailleur	20e9eb5f8f	Fix: syntax error	2013-04-10 10:40:59 +02:00
fhenry	275bf67bb7	[ task #811 ] Uniformanize note field	2013-04-09 17:18:07 +02:00
fhenry	8efeb93812	Merge branch 'develop' into develop_orderextrafield	2013-04-08 09:45:43 +02:00
fhenry	a27b3a2119	Fix PostGreSQL blocking install : wrong SQL syntax	2013-04-08 09:45:11 +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
Laurent Destailleur	88858136fc	New: Enhance agenda module to reach RFC2445 (add busy information).	2013-04-06 17:39:31 +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
Laurent Destailleur	adf47d6975	Qual: Uniformise columns	2013-04-06 00:34:33 +02:00
Laurent Destailleur	a3c5db968e	Merge pull request #800 from FHenry/develop Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...	2013-04-05 13:39:52 -07:00
Laurent Destailleur	7ebd24daea	Merge pull request #805 from zedzedtop/develop Develop	2013-04-05 13:28:58 -07:00
Laurent Destailleur	71716dcab5	Ref: sql file not up to date	2013-04-05 13:33:48 +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
Regis Houssin	d474955d56	Fix: missing renaming field !!	2013-04-03 18:54:44 +02:00
fhenry	ae00d8b214	Add import_key into llx_product_price	2013-04-02 15:03:01 +02:00
Laurent Destailleur	cc69cf7b76	New: Can defined a clicktodial setup per user	2013-03-31 16:44:24 +02:00
fhenry	e745cbb5cf	Add missing column into llx_extrafield creation	2013-03-28 22:13:04 +01:00
Sébastien de Chateauvieux	5921033f94	TVA NPR : Change field name recuperableonly to info_bits	2013-03-28 09:51:49 +04:00
Sébastien de Chateauvieux	be8a95a22b	Mise à jour des tables facture_fourn_det et product_fournisseur_price. Ajout d'un champ pour la gestion de la TVA NPR	2013-03-25 13:03:37 +04:00
Laurent Destailleur	fbf8d410d2	New: Support revenue stamp onto invoices	2013-03-23 17:34:23 +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
Laurent Destailleur	7703537b96	New: Work on cron module	2013-03-17 19:39:53 +01:00
Grand Philippe	e1baf806b9	change birth instead of naiss	2013-03-13 22:17: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
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
Grand Philippe	b081589129	english language standardization	2013-02-25 09:52:24 +01:00
frederic34	9333fdb97f	WIP : Admin for Carriers	2013-02-23 15:23:33 +01:00
frederic34	67c06225a5	WIP : Admin for carriers	2013-02-22 14:18:51 +01:00
Grand Philippe	785e72d533	fix trad : change adresse versus address	2013-02-15 19:36:09 +01:00
Grand Philippe	2bfd6c40d0	fix trad : change adresse versus address	2013-02-15 19:26:09 +01:00
Grand Philippe	12317d0371	fix trad : change adresse versus address	2013-02-15 19:18:26 +01:00
Grand Philippe	7c47dedbce	fix trad: begin change address instead of adresse	2013-02-15 17:33:07 +01:00
Laurent Destailleur	caec1429b1	Fix: Uniformize database type according to page http://	2013-02-13 15:19:03 +01:00
Christophe Battarel	b372a8c5ba	prepare db for margin on contracts	2013-02-13 08:59:40 +01:00
Laurent Destailleur	7ee530f826	New: Add field to store hierarchy of users.	2013-01-30 15:23:49 +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
Laurent Destailleur	f1f7ff315f	Fix: CRLF	2013-01-16 15:54:07 +01:00
Laurent Destailleur	d11cee399a	Merge remote-tracking branch 'origin/3.3' into develop Conflicts: COPYRIGHT htdocs/core/tpl/freeproductline_create.tpl.php htdocs/core/tpl/predefinedproductline_create.tpl.php htdocs/install/mysql/tables/llx_c_availability.sql	2013-01-16 15:45:17 +01:00
Laurent Destailleur	8d206fdfb0	Prepare move to other licence. For the moment all answers for licence upgrade were not yet received. So we prepare for GPL by uniformizing licence text keys to GPL-3+. Will move later to AGPL if all answers are positive.	2013-01-16 15:36:08 +01:00
Laurent Destailleur	29e6d01e51	Merge remote-tracking branch 'origin/3.3' into develop Conflicts: htdocs/core/tpl/freeproductline_create.tpl.php htdocs/core/tpl/predefinedproductline_create.tpl.php	2013-01-13 19:33:54 +01:00
Laurent Destailleur	5c51905f63	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-09 19:15:51 +01:00
Laurent Destailleur	24b50b8ed3	Fix: Example an label of category import	2013-01-09 13:29:12 +01:00
fhenry	23b2aa6a7b	[ task #664 ] Add extrafields behaviours to Member Type	2013-01-08 19:16:39 +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
Regis Houssin	b838895db9	Fix: change for a neutral email	2012-12-30 15:13:49 +01:00
Regis Houssin	5740c7e694	Fix: change for a neutral email	2012-12-30 15:11:07 +01:00
Laurent Destailleur	201829e60c	Fix:[ bug #653 ] Error while creating additional attributes	2012-12-30 13:49:37 +01:00
Laurent Destailleur	d4f81a9ee7	Fix: Predefined invoice feature was broken.	2012-12-27 12:51:38 +01:00
Grand Philippe	993e484bdd	prepare multi-user event	2012-12-12 12:17:56 +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	131dc88139	prepare module for "Single login at one time"	2012-12-08 18:14:13 +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	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
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	008f5fbcfc	New: extrafields are available onto users cards.	2012-11-30 15:55:59 +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
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	7035ec42f1	Task # 559 : Modifications to store unitprice as in supplier prices	2012-11-07 00:38:53 +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
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	fa46923b3e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-10-30 08:06:29 +01:00
Laurent Destailleur	a6bd506bd0	Fix: syntax error	2012-10-27 20:32:33 +02:00
Maxime Kohlhaas	bed17951b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559	2012-10-27 15:59:40 +02:00
Laurent Destailleur	443f5ca03e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2012-10-27 00:23:54 +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
Laurent Destailleur	aee92ad3dc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2012-10-26 00:59:11 +02:00
Laurent Destailleur	7eae998868	Fix: Bad default value	2012-10-26 00:57:51 +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	84df6bd639	Task # 559 : forgot to update supplier prices sql table	2012-10-25 08:19:16 +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	fdc6ed90a4	Task # 559 : forgot to update product_price table to add column	2012-10-24 17:22:45 +02:00
Maxime Kohlhaas	35773d08ff	Task # 559 : mysql table creation + index and constraints	2012-10-24 17:16:03 +02:00
simnandez	aa53b7a2ba	New: More import options. Thirds Bank Accounts	2012-10-19 13:00:53 +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
Laurent Destailleur	bef9fd152b	Fix: table creation scripts	2012-10-02 19:42:44 +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
Laurent Destailleur	f17906b331	Merge pull request #413 from aspangaro/develop Add a new column in llx_c_tva	2012-09-24 16:03:05 -07:00
Laurent Destailleur	7d83fdce5b	Fix: Several fixes into date functions Qual: Add PHPUnit tests	2012-09-24 21:37:19 +02:00
Spangaro Alexandre	ba45295c7e	Working for accountancy	2012-09-24 07:14:39 +02:00
Spangaro Alexandre	a6f9111b54	Add new column in llx_c_tva	2012-09-24 07:14:37 +02:00
Laurent Destailleur	d3ef78df47	Qual: Respect database rules Qual: Add indexes	2012-09-24 00:10:01 +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	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
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 Garcí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 Garcí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	5270ec06cb	Fix: compatibility with multicompany transverse mode	2012-09-07 17:20:12 +02:00
Regis Houssin	68c71896d4	Fix: add extraparams field for more parameters	2012-09-07 10:50:19 +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
Laurent Destailleur	4108e48d5c	Merge pull request #349 from FHenry/develop Change size of element type	2012-08-28 09:25:08 -07:00
Marcos García	07070b238b	Fixed SQL syntax problem	2012-08-27 02:41:49 +02:00
FHenry	d716763896	change size of elementtype	2012-08-26 21:53:40 +02:00
Spangaro Alexandre	9050431f87	Simply way to update chart of accounts	2012-08-26 17:11:19 +02:00
Regis Houssin	c9113458d9	New: [ task #498 ] part 3	2012-08-25 03:28:30 +02:00
Regis Houssin	6a60551fdd	Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-08-23 17:19:05 +02:00
Regis Houssin	c8e1aca7d8	New: [ task #498 ] part2	2012-08-23 07:50:20 +02:00
Maxime Kohlhaas	06ab1f6f94	Task 515 : New field added on contact : no_email	2012-08-22 22:59:10 +02:00
Regis Houssin	85c0dd95ca	Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline Conflicts: htdocs/install/mysql/migration/3.2.0-3.3.0.sql	2012-08-22 17:50:07 +02:00
Regis Houssin	4a5d89e6cc	Fix: move barcode type entries in module descriptor for best compatibility with multicompany	2012-08-22 17:44:52 +02:00
Regis Houssin	2ae1d3d3b5	New: [ task #498 ]	2012-08-22 17:42:40 +02:00
Laurent Destailleur	84d5b75518	New: Add field tms into llx_bank	2012-08-09 19:04:39 +02:00
Laurent Destailleur	a7d9f13287	Qual: Removed deprecated columns	2012-08-09 18:45:56 +02:00
Marcos García	568db22649	Renamed fk_methode_commande to fk_input_method	2012-07-22 16:58:37 +02:00
Marcos García	e6a192ba87	Renamed fk_demand_reason to fk_input_reason	2012-07-22 16:53:02 +02:00
Christophe Battarel	a37707f96f	updata database for margin module	2012-07-18 11:39:41 +02:00
Laurent Destailleur	6769cbbd2c	Increase size of ref for products	2012-07-02 17:47:16 +02:00
Regis Houssin	6246228544	New: add extraparams, hooks and extrafields for emailing card	2012-06-13 09:28:59 +02:00
Laurent Destailleur	eb541ceaa9	Fix: foreign key on non existing field	2012-05-06 15:33:33 +02:00

... 21 22 23 24 25 ...

2529 Commits