47757 Commits

Author	SHA1	Message	Date
Laurent Destailleur	92da0cfe38	Fix text sticked on picto.	2016-06-06 17:21:18 +02:00
Laurent Destailleur	29fab54578	Fix box of last contracted contract (contract ref was not visible, label ... was wrong).	2016-06-06 17:18:31 +02:00
Laurent Destailleur	559c1aa010	Fix alignetment of title in some arrays	2016-06-06 16:37:18 +02:00
Laurent Destailleur	fb13225173	Fix links on list from warnings dashboard	2016-06-06 16:31:50 +02:00
gauthier	07d07d522a	FIX : if user is only allowed to see his companies, he must be allowed to see deplacement which are not linked to a company	2016-06-06 16:31:42 +02:00
gauthier	b153ae8c6b	FIX : wrong id user deplacement links	2016-06-06 16:12:27 +02:00
Laurent Destailleur	473ab18306	Fix link on workboard ... Fix warning picto is missing on task list	2016-06-06 15:48:41 +02:00
Laurent Destailleur	0e06f116a2	Fix truncation of event conente in agenda view	2016-06-06 15:13:55 +02:00
Laurent Destailleur	47308d27c3	Missing column import_key and import for vat payments	2016-06-06 14:37:06 +02:00
Laurent Destailleur	4416925a85	Merge pull request #5314 from fmarcet/peru ... Fix: Missing userid on query	2016-06-06 13:40:20 +02:00
Laurent Destailleur	293534273f	Merge pull request #5313 from aspangaro/4.0-p33 ... Fix: colspan in vat list of payments	2016-06-06 13:39:07 +02:00
Laurent Destailleur	788c20516c	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-06-06 13:37:59 +02:00
Laurent Destailleur	06b1336ba9	Merge pull request #5310 from aspangaro/4.0-p31 ... Fix: Accountancy - Right to access to fiscal year	2016-06-06 13:37:00 +02:00
Laurent Destailleur	1f93425193	Merge pull request #5308 from atm-maxime/develop ... FIX #5044	2016-06-06 13:35:59 +02:00
Laurent Destailleur	e10db62b3a	Fix a deadlock situation. If order set to billed by error, no way to ... solve situation.	2016-06-06 13:29:37 +02:00
Laurent Destailleur	52fefc2d02	Debug module resource	2016-06-06 13:14:05 +02:00
Laurent Destailleur	9b6e5196ea	Debug module resource. Filter on agenda.	2016-06-06 13:05:36 +02:00
Laurent Destailleur	681249de8a	Debug module resource	2016-06-06 12:29:15 +02:00
Your Name	68fa27ec03	Fix: Missing userid on query	2016-06-06 12:00:24 +02:00
Maxime Kohlhaas	fdfcc064dc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2016-06-06 11:53:53 +02:00
Laurent Destailleur	9c88eadbe4	Fix: button to generate invoice manually must be disabled if we reach ... max number of generation.	2016-06-06 11:48:39 +02:00
Laurent Destailleur	a0458be943	Fix object not defined	2016-06-06 11:25:54 +02:00
Laurent Destailleur	9eee61e6b7	Fix trans	2016-06-06 11:13:19 +02:00
Laurent Destailleur	51ce4804dd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-06 10:58:43 +02:00
Laurent Destailleur	ff23c825ae	Code comment	2016-06-06 10:58:23 +02:00
aspangaro	e911b32b83	Fix: Loan - Totalpaid (Only the capital is deducted from the amount of loan to be paid off)	2016-06-05 16:15:04 +02:00
aspangaro	bfb212f61a	Fix: Loan - Add dol_fiche	2016-06-05 16:08:40 +02:00
aspangaro	3b3567a718	Fix: colspan	2016-06-05 15:50:32 +02:00
aspangaro	bc92818c1a	New: Loan - Show accounting account in card in view mode	2016-06-05 15:39:41 +02:00
aspangaro	fda07997d2	Fix: Loan - Remove page note, already present in card	2016-06-05 15:25:21 +02:00
aspangaro	1d5dd0d16e	New: Loan - Add accountancy account list	2016-06-05 15:21:11 +02:00
aspangaro	23b748aca3	Fix: Accountancy - Access rights	2016-06-05 14:22:13 +02:00
aspangaro	466010a412	Fix: Accountancy 4.0 - Right to access to fiscal year	2016-06-05 14:14:20 +02:00
Maxime Kohlhaas	caaffdb0c3	FIX #5044	2016-06-05 02:54:25 +02:00
novalore	b52c441c64	english fix in accountancy for currency	2016-06-05 02:26:10 +02:00
Laurent Destailleur	248ac67af2	Fix php test	2016-06-05 02:24:31 +02:00
Laurent Destailleur	293c8e145a	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/imports/import.php htdocs/langs/en_US/admin.lang	2016-06-05 02:20:27 +02:00
Maxime Kohlhaas	0ab4827091	FIX #5087	2016-06-05 02:06:32 +02:00
Laurent Destailleur	c07933729a	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-06-05 00:29:40 +02:00
Laurent Destailleur	c09dbe05b3	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/expensereport/card.php htdocs/langs/en_US/admin.lang	2016-06-05 00:25:08 +02:00
Maxime Kohlhaas	a5472b58d1	FIX #5108	2016-06-05 00:24:00 +02:00
Laurent Destailleur	db2269b9dd	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/langs/en_US/admin.lang	2016-06-05 00:12:34 +02:00
Laurent Destailleur	bbe5e398a5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-04 19:36:41 +02:00
Laurent Destailleur	147212437b	FIX #4078 Edit inline of label of supplier invoice is ok.	2016-06-04 19:36:28 +02:00
Maxime Kohlhaas	7866fb9dae	Fix #5153	2016-06-04 19:11:32 +02:00
Laurent Destailleur	7bc9d980dc	Merge pull request #5293 from novalore/develop ... correction on banks.lang as mentioned in #5267	2016-06-04 19:00:04 +02:00
Laurent Destailleur	5de8eef08d	Merge pull request #5300 from defrance/patch-8 ... if socity then company requiered	2016-06-04 18:47:01 +02:00
Maxime Kohlhaas	c3cf72afcc	Merge pull request #5296 from aschio/develop ... FIX #5134	2016-06-04 18:46:33 +02:00
Maxime Kohlhaas	a142588292	Merge pull request #5298 from pselis/develop ... fix #4467	2016-06-04 18:44:45 +02:00
cla	b440ad4e7b	FIX #5134: fixed action 'edit' top page	2016-06-04 18:44:10 +02:00
BENKE Charlie	a193920ddc	if socity then company requiered	2016-06-04 18:40:53 +02:00
novalore	c5ed9e723f	bills.lang: TIP payment fixed in en_US	2016-06-04 18:39:04 +02:00
Laurent Destailleur	9508de85af	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-04 18:37:56 +02:00
Laurent Destailleur	c2e853db41	FIX A non admin user should not be able to set/unset a user as admin ... even if he has right to manage permission	2016-06-04 18:37:41 +02:00
novalore	d750401eb0	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2016-06-04 18:32:27 +02:00
Maxime Kohlhaas	abe84ef991	Fix rights check on expense reports	2016-06-04 18:32:00 +02:00
paolo	ff95bb1644	fix #4467	2016-06-04 18:31:31 +02:00
cla	9ac05fa8f2	FIX #5134	2016-06-04 18:17:13 +02:00
BENKE Charlie	af8e0802f8	fix : login required not verified on update	2016-06-04 18:15:52 +02:00
Maxime Kohlhaas	3ef9fe2c40	Fix product supplier price modification with multicompany	2016-06-04 18:10:40 +02:00
novalore	5de8b6eee5	correction on banks.lang as mentioned in #5267	2016-06-04 18:04:49 +02:00
BENKE Charlie	d86f89a8fa	fix : #4853 ... append if not contact type for the element	2016-06-04 17:55:28 +02:00
Laurent Destailleur	d1727139f0	Merge pull request #5291 from novalore/develop ... Bug fix: missing string in compta.lang	2016-06-04 17:50:15 +02:00
Laurent Destailleur	7e7d0fbe37	Merge pull request #5284 from atm-ph/fix_develop_issue_2666 ... Fix #2666	2016-06-04 17:39:31 +02:00
novalore	2d907bc727	miscellaneous lang fixes in en_US	2016-06-04 17:34:23 +02:00
novalore	dcd83c403b	Fix #4968	2016-06-04 17:34:04 +02:00
Laurent Destailleur	cff320dbe1	Merge pull request #5289 from tiaris/devcamp2 ... FIX #4173 Ergonomie of product/service card	2016-06-04 17:32:26 +02:00
phf	a62f5bd5b4	Fix #2777	2016-06-04 17:17:22 +02:00
Juanjo Menent	5da197c517	Merge pull request #5288 from simnandez/develop ... Fix printing following the rules	2016-06-04 16:41:22 +02:00
jean	49d0c8d5ff	FIX #4173 Ergonomie of product/service card ... Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying nophoto.png	2016-06-04 16:34:26 +02:00
Juanjo Menent	8f617b196a	Fix printing following the rules	2016-06-04 15:51:28 +02:00
jean	918ba71e7f	FIX #5014 ... if $user is admin and different from $object then nbadmin >=1 is ok when not in multicompany	2016-06-04 14:59:43 +02:00
Laurent Destailleur	c59c86e648	Merge branch 'develop' of https://github.com/aschio/dolibarr into ... develop Conflicts: htdocs/fourn/facture/list.php	2016-06-04 14:55:02 +02:00
Laurent Destailleur	1748da6c56	Merge	2016-06-04 14:51:56 +02:00
phf	8ccda16ef3	Fix call function ldap_connect but not exists	2016-06-04 14:50:32 +02:00
Maxime Kohlhaas	bd2fe75d08	Fix menus in dashboard links	2016-06-04 14:45:03 +02:00
Laurent Destailleur	dec1af78c3	Merge pull request #5279 from atm-maxime/fix_dont_delete_order_shipment_link ... Don't delete link between order and shipment	2016-06-04 14:34:54 +02:00
Laurent Destailleur	1dd9e37b2e	Merge pull request #5281 from simnandez/develop ... Fix better perfomance in for	2016-06-04 14:34:39 +02:00
Laurent Destailleur	054329c319	Merge pull request #5283 from novalore/develop ... en_US lang fixes again	2016-06-04 14:34:15 +02:00
phf	b3a36688d1	Fix #2666	2016-06-04 14:31:53 +02:00
Laurent Destailleur	674164b71c	Add a better explanation on job generation	2016-06-04 14:30:05 +02:00
novalore	d924be8b95	en_US lang fixes again	2016-06-04 14:21:21 +02:00
Laurent Destailleur	22b231e686	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-04 14:11:27 +02:00
Laurent Destailleur	975d9357fa	FIX On recurring invoice, when generation is done manually from card, ... counter of number of generation must be +1	2016-06-04 14:08:57 +02:00
phf	01b881a0a6	Fix builddoc with odt lost value of extrafields as "sellist" on view card	2016-06-04 13:24:42 +02:00
Juanjo Menent	baa6dd84cf	Fix better perfomance in for	2016-06-04 13:12:05 +02:00
Maxime Kohlhaas	cc2b2a0baa	Don't delete link between order and shipment	2016-06-04 11:52:36 +02:00
Laurent Destailleur	bfb7923d4c	Merge pull request #5268 from atm-ph/fix_multicurrency_conf ... Fix conf useful has been commented	2016-06-04 11:37:01 +02:00
Laurent Destailleur	5a105b75ec	Merge pull request #5276 from atm-maxime/fix_import_mapping ... FIX #5229	2016-06-04 11:35:27 +02:00
Juanjo Menent	8a9dd14ab7	Merge pull request #5278 from novalore/develop ... other fixes in en_US lang files	2016-06-04 10:08:02 +02:00
Juanjo Menent	43d475aa42	Merge pull request #5272 from simnandez/3.9 ... Fix issues with strict mode	2016-06-04 10:07:01 +02:00
Laurent Destailleur	eb7a4c5ccf	FIX Creating a supplier order from proposal order	2016-06-04 02:39:13 +02:00
cla	e1c27216ce	FIX #4825	2016-06-04 02:20:11 +02:00
novalore	3ee8f931b4	other fixes in en_US lang files	2016-06-04 02:16:58 +02:00
Laurent Destailleur	c9834117c9	Fix #5156	2016-06-04 02:03:30 +02:00
Laurent Destailleur	32b6766a7d	FIX #5195	2016-06-04 01:50:01 +02:00
phf	b000ccf2e2	Fix traduction for multicurrency module	2016-06-04 01:46:10 +02:00
cla	6c126da9a9	FIX #4141	2016-06-04 01:34:04 +02:00
Maxime Kohlhaas	a1c7632a50	Fix import mapping #5229	2016-06-04 01:28:51 +02:00
Laurent Destailleur	ff6daebee6	FIX #5203	2016-06-04 01:19:27 +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
phf	495ce2463d	Fix switch currency on document do not get the associate rate	2016-06-04 01:13:23 +02:00
Laurent Destailleur	085fa6902b	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/contrat/list.php htdocs/fourn/ajax/getSupplierPrices.php	2016-06-04 00:58:16 +02:00
Laurent Destailleur	609cc1dd70	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-06-04 00:53:09 +02:00
Laurent Destailleur	9c3365aefc	FIX #5163	2016-06-04 00:52:55 +02:00
phf	e3a5af6ad4	Fix clean multicurrency admin	2016-06-04 00:42:01 +02:00
Laurent Destailleur	b51c4ab57b	Merge pull request #5275 from novalore/develop ... Miscellaneous typos and errors in en_US lang files	2016-06-04 00:20:27 +02:00
Laurent Destailleur	1f65ca1961	Merge pull request #5274 from atm-maxime/fix_import_model_type_size4 ... Fix import model not correctly saved #5185	2016-06-04 00:18:32 +02:00
novalore	e2ba9c72a8	French string in main.lang	2016-06-04 00:18:15 +02:00
Laurent Destailleur	5c36aa3802	Merge pull request #5271 from aschio/develop ... FIX #5192	2016-06-04 00:17:45 +02:00
Maxime Kohlhaas	f2e4fdcce4	Fix import model not correctly saved #5185	2016-06-04 00:16:01 +02:00
novalore	1227ee5eb6	Miscellaneous typos and errors in en_US lang files	2016-06-04 00:14:56 +02:00
Maxime Kohlhaas	8901b99e2d	Fix import model not correctly saved #5185	2016-06-04 00:14:08 +02:00
Laurent Destailleur	b47db3e9e1	Merge pull request #5266 from atm-maxime/fix_project_time_spent_access ... Fix access to project task time spent creation #5249	2016-06-04 00:13:32 +02:00
cla	deb7c407ad	FIX #4643	2016-06-04 00:08:13 +02:00
Juanjo Menent	66c73015b2	Fix issues with strict mode	2016-06-03 23:58:54 +02:00
Maxime Kohlhaas	8b0b3b1a9d	PMP available only if stock module enabled	2016-06-03 23:49:34 +02:00
cla	18424812db	closes #5192. ... I deleted the line and moved last_insert_id() functions 3 lines under	2016-06-03 23:49:08 +02:00
phf	923952fb25	Fix conf useful has been commented	2016-06-03 23:36:58 +02:00
Maxime Kohlhaas	c9c7045a6f	Fix access to project task time spent creation #5249	2016-06-03 23:34:37 +02:00
Laurent Destailleur	4226396da4	Merge pull request #5262 from atm-ph/fix_develop_fetch_extra_link ... Fix using extrafield type "link to object" show error on edit card	2016-06-03 23:18:24 +02:00
phf	778b05c341	Fix #4632	2016-06-03 23:06:53 +02:00
Laurent Destailleur	149c6916f8	FIX ##5263	2016-06-03 22:20:58 +02:00
Laurent Destailleur	f81a4c56b7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-03 22:15:25 +02:00
Laurent Destailleur	fb724566f0	FIX #5252	2016-06-03 22:15:07 +02:00
Laurent Destailleur	448c394f2a	Fix date of recurrin invoice	2016-06-03 22:10:33 +02:00
Laurent Destailleur	776118a152	FIX Translation of lithuania	2016-06-03 21:32:12 +02:00
phf	cd79675f7a	Fix using extrafield type "link to object" show error on edit card	2016-06-03 21:16:25 +02:00
Laurent Destailleur	6cb6ccf947	Merge pull request #5259 from sbechet/develop ... Regression	2016-06-03 18:19:31 +02:00
Juanjo Menent	99a28a9dcd	Fix Travis error introduced in commit '236ecf01'	2016-06-03 16:15:27 +02:00
Sebastien Bechet	be5eb42a46	Merge remote-tracking branch 'upstream/develop' into develop	2016-06-03 16:15:12 +02:00
Sebastien Bechet	7f98b1ceff	Regression	2016-06-03 10:21:37 +02:00
Laurent Destailleur	a5d7c303e7	FIX Button must be out of tabs	2016-06-02 21:11:14 +02:00
Laurent Destailleur	ebd8f2cf86	Prepare 4.0	2016-06-02 13:33:22 +02:00
Maxime Kohlhaas	ab44adc6d5	Fix SQL error on order stats	2016-06-02 12:37:37 +02:00
Laurent Destailleur	f07559a784	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-06-02 11:44:19 +02:00
Frédéric FRANCE	19f6aa805b	select engine for code 128 didn't work	2016-06-02 11:41:26 +02:00
Laurent Destailleur	0f53993c6f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-02 11:24:24 +02:00
Laurent Destailleur	5106f40a56	Merge branch 'develop_NEW_decrease_stock_expedition_classify' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_decrease_stock_expedition_classify Conflicts: htdocs/expedition/class/expedition.class.php	2016-06-02 11:23:49 +02:00
Laurent Destailleur	b8ee75ce23	Merge pull request #5248 from IonAgorria/patch-2 ... Fix: Fill ref_supplier in product get_buyprice	2016-06-02 10:06:17 +02:00
Laurent Destailleur	f40f5e28ad	Merge pull request #5254 from atm-florian/3.9_fix5209 ... FIX #5209	2016-06-02 10:05:37 +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	c663ca13b8	Fix edit left menu	2016-06-01 21:41:47 +02:00
Laurent Destailleur	780d1628a9	Missing trans	2016-06-01 21:19:21 +02:00
Laurent Destailleur	bf5fbd3a80	FIX Infinite loop on menu tree output for edition ... FIX Can show tree of entries added by external modules using fk_mainmenu and fk_leftmenu instead of fk_menu.	2016-06-01 21:14:28 +02:00
Laurent Destailleur	028ff5e84c	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/card.php htdocs/langs/en_US/products.lang htdocs/societe/list.php	2016-06-01 17:59:50 +02:00
Laurent Destailleur	ee420b79b1	FIX Infinite loop on menu tree output for edition ... FIX Can show tree of entries added by external modules using fk_mainmenu and fk_leftmenu instead of fk_menu.	2016-06-01 17:52:06 +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
Laurent Destailleur	40005b8f65	FIX Missing search on barcode, only if defined	2016-06-01 12:15:54 +02:00
Florian HENRY	d17a879f33	add into migratino script	2016-05-31 23:32:21 +02:00
Florian HENRY	ed05321438	comment don't need to be updated	2016-05-31 23:24:35 +02:00
Florian HENRY	3c42a32690	FIX: #5151	2016-05-31 23:22:15 +02:00
Florian HENRY	41a41f8931	FIX #5209	2016-05-31 22:55:49 +02:00
Laurent Destailleur	cc68b885a3	Fix minor css errors	2016-05-30 22:39:26 +02:00
Laurent Destailleur	1bc6c4ffa3	Clean code	2016-05-30 20:50:49 +02:00
Laurent Destailleur	0d277083e6	Fix duplicate translation	2016-05-30 19:56:59 +02:00
Laurent Destailleur	58ba5838ce	Fix alias name already visible into banner	2016-05-30 19:41:28 +02:00
Laurent Destailleur	460d7ce915	FIX Split of credit note into discount page generates records not ... correctly recognised as credit note.	2016-05-30 19:38:28 +02:00
Laurent Destailleur	89cb122474	Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9	2016-05-30 18:15:19 +02:00
Laurent Destailleur	ed148f70b3	FIX Filter on assigned to was preselected on current user on list "All ... events" (instead of no filtering)	2016-05-30 18:12:27 +02:00
Laurent Destailleur	3cc8207bb7	FIX Filter on category tag for suppliers	2016-05-30 17:20:34 +02:00
Laurent Destailleur	2290f6a123	FIX Menu statistics was not visible if module proposal was not enabled	2016-05-30 13:11:44 +02:00
Laurent Destailleur	46a0f3dab0	Fix minor bugs	2016-05-30 01:30:28 +02:00
Laurent Destailleur	2dcc578b88	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-30 00:52:59 +02:00
Laurent Destailleur	3ddf427ff1	FIX Legal issue for GB. Add hidden option for this.	2016-05-30 00:52:16 +02:00
Ion Agorria	ade417855b	Fill ref_supplier in product get_buyprice	2016-05-29 13:45:26 +02:00
Laurent Destailleur	4c93340de1	Merge pull request #5232 from atm-florian/develop ... Add trigger into expedition class	2016-05-29 13:15:35 +02:00
Laurent Destailleur	a1a335025f	FIX #5230	2016-05-29 12:05:11 +02:00
Laurent Destailleur	c2d8bd99dc	Merge pull request #5244 from atm-gauthier/3.8_fix_mergepropal ... FIX : same page added several times on mergepropal option	2016-05-29 12:03:35 +02:00
Laurent Destailleur	889ff16906	FIX #5239	2016-05-29 11:56:19 +02:00
Laurent Destailleur	d8c6ae0b17	Removed warnings	2016-05-29 11:26:05 +02:00
Laurent Destailleur	0b6bda910b	Removed scrutinizer warning	2016-05-29 11:23:32 +02:00
Laurent Destailleur	0c6e8b626a	Fix var not initialized	2016-05-29 11:20:27 +02:00
Laurent Destailleur	22d6d9497e	Fix ambiguous test on ldap return of getAttributes	2016-05-29 11:20:12 +02:00
Laurent Destailleur	ba43297936	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-28 14:10:41 +02:00
Juanjo Menent	caca9f0dd2	Merge pull request #5247 from simnandez/develop ... Fix: Bad encoding and use original function 'implode' instead aliases 'join'	2016-05-28 11:53:51 +02:00
Juanjo Menent	fb5eef3163	Merge pull request #5246 from IonAgorria/patch-1 ... Fix: Fill ref_supplier in product supplier price	2016-05-28 11:53:25 +02:00
Juanjo Menent	a63dac3a9c	Merge pull request #5240 from fmarcet/peru ... Fix: Update Peru regions and departaments	2016-05-28 11:51:46 +02:00
Laurent Destailleur	ef1e4d05ec	Doc comment	2016-05-27 17:01:23 +02:00
Laurent Destailleur	9511187f6e	FIX Change to status "Shipment in progress" for orders is done whane ... validating and not creating a shipment.	2016-05-27 16:49:55 +02:00
Laurent Destailleur	c653acd4ce	Minor fixes	2016-05-27 14:56:59 +02:00
Juanjo Menent	5dec8f1935	Fix: Bad encoding and use original function 'implode' instead aliases 'join'	2016-05-27 10:56:39 +02:00
Laurent Destailleur	7278d1f2c6	NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check ... deposit feature.	2016-05-27 10:38:15 +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	97278c254e	Doc comment	2016-05-26 21:12:36 +02:00
Ion Agorria	6ba86e9d03	Fill ref_supplier in product supplier price	2016-05-26 20:53:01 +02:00
Laurent Destailleur	b8d5d6a383	Fix bad placeholder	2016-05-26 19:38:52 +02:00
Laurent Destailleur	b410aa57b9	Fix: Fetching category on label is not enough. We must introduce type	2016-05-25 15:36:48 +02:00
gauthier	71ee941cf8	FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty	2016-05-25 12:25:39 +02:00
gauthier	1ce91bac06	FIX : same page added several times on mergepropal option	2016-05-25 11:25:19 +02:00
Laurent Destailleur	b476153b8b	Move POS at end of top menu	2016-05-25 00:02:48 +02:00
Laurent Destailleur	1617f3c62a	Fix colspan	2016-05-24 20:24:51 +02:00
Laurent Destailleur	a587ba496c	NEW Can select fields on supplier orders	2016-05-24 18:43:35 +02:00
Laurent Destailleur	9bd9cda224	Move to HTML5	2016-05-24 16:02:43 +02:00
Laurent Destailleur	e0812dddd2	Enhance css	2016-05-24 15:59:56 +02:00
Your Name	c581b05c26	Fix: Update Peru regions and departaments	2016-05-23 18:38:55 +02:00
florian HENRY	37d366478f	change trigger position	2016-05-23 14:18:29 +02:00
Laurent Destailleur	24d7c6aae7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-05-23 12:27:15 +02:00
Laurent Destailleur	e2e95641a3	FIX Search supplier ref on contract	2016-05-23 12:27:02 +02:00
florian HENRY	4e707af0fd	Add demo information and transsaction management	2016-05-23 09:16:47 +02:00
florian HENRY	8afaf07810	Merge remote-tracking branch 'origin/develop' into develop	2016-05-23 08:55:39 +02:00
Laurent Destailleur	f398174772	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/menus/standard/auguria_menu.php htdocs/core/menus/standard/eldy.lib.php	2016-05-22 19:34:27 +02:00
Laurent Destailleur	426454a67b	Prepare the hide left menu icon	2016-05-22 19:32:08 +02:00
Xebax	2355a0c38c	FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu.	2016-05-22 17:15:22 +02:00
Laurent Destailleur	3119d77565	Add warning on deprecated param	2016-05-22 16:36:48 +02:00
Laurent Destailleur	3df464270c	Remove useless code	2016-05-22 16:12:42 +02:00
Laurent Destailleur	ac84ae0ff5	Clean explorer	2016-05-22 15:29:12 +02:00
Laurent Destailleur	382df0d8f1	NEW Rest API token is no more reset at each call. We can reset it with ... param reset=1 on login call.	2016-05-22 15:20:21 +02:00
Laurent Destailleur	ee3d25d9fa	Clean code for REST API.	2016-05-22 15:10:43 +02:00
Laurent Destailleur	11ae76f4fb	More neutral picto for EDM module	2016-05-22 14:39:34 +02:00
Laurent Destailleur	5e9809ccb6	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-05-22 14:34:31 +02:00
Laurent Destailleur	d8f717a6e0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-22 14:31:50 +02:00
Laurent Destailleur	a9cd73b215	Fix css	2016-05-22 14:31:34 +02:00
Laurent Destailleur	b86b464931	Merge pull request #5233 from IonAgorria/email-template-hook ... NEW Hook for adding new email templates on list	2016-05-22 14:25:06 +02:00
Laurent Destailleur	3abe1d8e81	Merge pull request #5220 from fmarcet/expenses ... The approved status is enough to expense appear in the report	2016-05-22 14:22:38 +02:00
Laurent Destailleur	87d26ecef6	Merge pull request #5228 from simnandez/develop ... Fix issues with strict mode	2016-05-22 14:20:05 +02:00
Frédéric FRANCE	7048191815	Update commande.class.php	2016-05-22 08:57:23 +02:00
Laurent Destailleur	db432e2cc4	Fix lot number	2016-05-21 18:12:03 +02:00
Laurent Destailleur	b95981a2be	Fix missing ; at end of sql	2016-05-21 18:03:13 +02:00
Laurent Destailleur	634ebaa3b6	Fix into conf.class.php file we must use $this and not $conf	2016-05-21 16:01:14 +02:00
Laurent Destailleur	6987d3db28	Fix css	2016-05-21 15:03:02 +02:00
Laurent Destailleur	a278fd66d0	Fix color of link for categories	2016-05-21 14:51:33 +02:00
Laurent Destailleur	7935967c62	Fix duplicate translation key	2016-05-21 12:30:58 +02:00
Laurent Destailleur	5fd64c81a6	Missing translation	2016-05-21 12:21:17 +02:00
Laurent Destailleur	a66901d7d5	Enhance css	2016-05-21 12:09:54 +02:00
Laurent Destailleur	075b92b4c3	FIX Field for opportunities must not be visible if option off	2016-05-21 12:06:33 +02:00
Frédéric FRANCE	9e5db0f3c6	Fix next month or next year in opensurvey ... http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55209-bug-calendrier-opensurvey-v3-9	2016-05-21 09:18:16 +02:00
Ion Agorria	651b1e1d3a	Hook for adding new email templates on list	2016-05-21 03:32:36 +02:00
florian HENRY	acdf781202	change tirrger name to harmonised	2016-05-20 20:12:23 +02:00
florian HENRY	82d6f4c808	add trigger on set draft order	2016-05-20 20:09:30 +02:00
florian HENRY	32a0f4c530	Add trigger into expedition class	2016-05-20 20:03:29 +02:00
Laurent Destailleur	e677390347	Fix bad property name	2016-05-19 22:04:36 +02:00
Laurent Destailleur	e6a78739bd	Fix translation from a key that is a numeric	2016-05-19 21:12:09 +02:00
Juanjo Menent	341c70fa87	Merge remote-tracking branch 'upstream/develop' into develop	2016-05-19 21:03:44 +02:00
Juanjo Menent	d8897214cd	Fix issues with strict mode	2016-05-19 21:01:52 +02:00
Laurent Destailleur	453937bdfd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-19 20:58:41 +02:00
Laurent Destailleur	4298b685d3	Fix css	2016-05-19 20:58:14 +02:00
Laurent Destailleur	61e824726e	Merge pull request #5227 from mrsof/patch-9 ... Syntax error : bad name of field	2016-05-19 19:12:11 +02:00
Laurent Destailleur	b636451875	Fix php tag	2016-05-19 19:11:31 +02:00
Laurent Destailleur	afdef9a328	Add css	2016-05-19 18:52:22 +02:00
Laurent Destailleur	b82eabe25f	Code comment	2016-05-19 18:52:12 +02:00
Sof	da2c9a0f74	Syntax error : bad name of field	2016-05-19 17:42:57 +02:00
Laurent Destailleur	7087b650d0	More precise parameter parameter targetwithdetails	2016-05-19 17:37:06 +02:00
Your Name	106f456c6b	Last change	2016-05-19 16:50:18 +02:00
Laurent Destailleur	d723f26661	Fix css	2016-05-19 13:32:06 +02:00
Laurent Destailleur	9c3b9a8494	NEW: Link on user in leave context reach to leave tab.	2016-05-19 13:25:16 +02:00
Laurent Destailleur	fd38db388a	Rename box into widget	2016-05-19 10:05:02 +02:00
Laurent Destailleur	400572e18a	Fix column size	2016-05-18 21:04:37 +02:00
Laurent Destailleur	4c2098b667	Fix duplicate table title	2016-05-18 20:58:29 +02:00
Laurent Destailleur	e7072185ab	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/comm/propal.php	2016-05-18 20:47:57 +02:00
Laurent Destailleur	49c2549400	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/comm/propal.php	2016-05-18 20:40:09 +02:00
Laurent Destailleur	7cca4f3e8a	Merge pull request #5211 from defrance/patch-4 ... enhance rappro feature	2016-05-18 20:38:07 +02:00
Laurent Destailleur	12a5fbbea7	Merge pull request #5191 from FHenry/3.8 ... Fix email template edition	2016-05-18 20:35:42 +02:00
Laurent Destailleur	85cc5cbf02	Merge pull request #5210 from simnandez/3.9 ... FIX issues with entity in leave creation	2016-05-18 20:28:35 +02:00
Laurent Destailleur	24673d066f	Merge pull request #5216 from atm-maxime/fix_dispatch_services_on_supplier_order ... FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES	2016-05-18 20:27:31 +02:00
Laurent Destailleur	28e9460a84	Merge pull request #5226 from joseplluis/patch-1 ... Fix bug: filter third parties without categories	2016-05-18 20:24:22 +02:00
Laurent Destailleur	ee73a91c77	Merge pull request #5218 from atm-florian/develop ... Fix : Advanced Accountancy module	2016-05-18 20:22:07 +02:00
Josep Lluís	0ad21be132	Fix bug: filter third parties without categories ... There is a bug on filter third parties without categories. No records found.	2016-05-18 19:27:57 +02:00
Your Name	c2b958a039	Correction compatibility Postgresql	2016-05-18 18:52:38 +02:00
Your Name	23311cdba1	Merge remote-tracking branch 'origin/develop' into expenses	2016-05-18 18:46:05 +02:00
Laurent Destailleur	b1bd6b5d6e	Fix regression	2016-05-18 18:23:38 +02:00
Regis Houssin	c7dda59fbc	Fix: doublon (merge problem?)	2016-05-18 17:33:51 +02:00
Laurent Destailleur	cf8c180fa4	Fix perm and CRLF	2016-05-18 16:26:15 +02:00
Laurent Destailleur	f3cd4b3ee8	Fix doxygen	2016-05-18 14:43:56 +02:00
Laurent Destailleur	7e66a4cd1d	Merge pull request #5221 from atm-florian/dev_fixwarning ... FIX : php strict warning	2016-05-18 13:58:08 +02:00
Laurent Destailleur	43cb646779	Merge pull request #5219 from fmarcet/3.8 ... Fix: Expensereport not compatible with multicompany	2016-05-18 13:52:45 +02:00
Laurent Destailleur	a4b497ef81	Merge pull request #5212 from atm-alexis/3.8_fix_hook_called_but_not_initialized ... FIX 3.8 hook on group card called but not initialized	2016-05-18 13:50:21 +02:00
Laurent Destailleur	bba3dc7dcd	Make composer cleaner	2016-05-18 13:39:57 +02:00
Laurent Destailleur	9f20779136	Revert "Update escpos-php" ... This reverts commit 2f42a226d0.	2016-05-18 13:18:55 +02:00
Laurent Destailleur	e7385c9e4f	Try to solve side effect of this fuck... autoload creating a big mess in ... a lot of features.	2016-05-18 11:57:13 +02:00
Laurent Destailleur	e6196f69cd	Fix Restler bug returning warnings	2016-05-18 00:45:13 +02:00
Laurent Destailleur	cd75b43d58	Can enable modules during migration	2016-05-18 00:44:55 +02:00
Laurent Destailleur	acae888b3a	Fix phpunits	2016-05-17 23:38:07 +02:00
Laurent Destailleur	c8a8474b69	Better practice in boolean comparison	2016-05-17 23:19:57 +02:00
Laurent Destailleur	753c5c7fc4	Fix minor error management	2016-05-17 23:14:30 +02:00
Laurent Destailleur	4e46a01d51	Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-05-17 22:59:46 +02:00
Laurent Destailleur	89d37ccc62	Fix translation	2016-05-17 21:55:39 +02:00
Laurent Destailleur	a36b780c53	Fix phpunit	2016-05-17 20:30:04 +02:00
Laurent Destailleur	92e7177bcb	Fix New into new	2016-05-17 19:58:29 +02:00
Laurent Destailleur	86076c2a01	Fix doxygen	2016-05-17 19:49:37 +02:00
Laurent Destailleur	7bbb3a7da1	Supplier proposal was missing	2016-05-17 19:34:23 +02:00
Laurent Destailleur	7063b26018	Debug 4.0	2016-05-17 19:32:19 +02:00
Laurent Destailleur	e2d3f4e27d	Supplier proposal was missing	2016-05-17 19:15:44 +02:00
Laurent Destailleur	be251cd2b0	Add high risk sql at end	2016-05-17 18:22:48 +02:00
Laurent Destailleur	d083ad9382	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/product/class/product.class.php htdocs/resource/class/html.formresource.class.php	2016-05-17 18:21:22 +02:00
Laurent Destailleur	79be93d998	FIX The table llx_product_lot is now filled/used to store eatby/sellby ... dates.	2016-05-17 18:19:36 +02:00
Laurent Destailleur	0e040b166d	Fix: When we edit a product to use lot/serial number, we initialize ... records for unknown lots to generic value 'Undefined'.	2016-05-17 17:55:41 +02:00
Laurent Destailleur	668df6cb7d	Debug resource module	2016-05-17 10:51:13 +02:00
Laurent Destailleur	3b99fb01ee	Fix duplicate table	2016-05-17 10:51:03 +02:00
Laurent Destailleur	63d0710842	FIX Creation of the second ressource type fails.	2016-05-17 10:44:30 +02:00
Your Name	c30a3a5f7e	Expense report grouped by user	2016-05-17 10:02:36 +02:00
florian HENRY	cb1192aba5	check spelling	2016-05-17 09:03:27 +02:00
florian HENRY	4e98f57385	FIX : php strict warning	2016-05-17 09:02:22 +02:00
florian HENRY	67da7ab945	d	2016-05-17 08:50:54 +02:00
florian HENRY	91a436af81	resetExped	2016-05-17 08:46:28 +02:00
florian HENRY	a45680dc19	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2016-05-17 08:37:22 +02:00
Laurent Destailleur	f9ded46a99	Start debug 4.0	2016-05-17 02:41:06 +02:00
Laurent Destailleur	901c7c9517	Link "Backtolist" was missing on products	2016-05-17 02:16:28 +02:00
Laurent Destailleur	05cbfbb38f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/install/mysql/migration/repair.sql	2016-05-17 01:19:49 +02:00
Laurent Destailleur	1973f67d41	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-17 01:11:14 +02:00
Laurent Destailleur	3a28935da3	Merge remote-tracking branch 'origin/3.9' into develop	2016-05-17 01:10:22 +02:00
Laurent Destailleur	95ea20eb44	Clean code for stock movement when lot are used. We should not get ... duplicate records into llx_product_batch	2016-05-17 01:10:11 +02:00
Laurent Destailleur	75b4c61fbc	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/contrat/card.php	2016-05-17 00:02:54 +02:00
Laurent Destailleur	94c532dd8a	Clean splitted lines into llx_product_batch	2016-05-16 23:58:06 +02:00
Laurent Destailleur	20a2e9394d	Fix typo comment	2016-05-16 22:44:11 +02:00
Laurent Destailleur	929787006e	Clean data	2016-05-16 22:40:29 +02:00
Laurent Destailleur	ad92b53d00	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-05-16 19:34:48 +02:00
Laurent Destailleur	4a3083a4c1	FIX Remove PHP Warning: Creating default object from empty value.	2016-05-16 19:34:24 +02:00
Your Name	e1fa86914e	The approved status is enough to expense appear in the report	2016-05-16 18:41:41 +02:00
Your Name	f7c9f20b16	Fix: Expensereport not compatible with multicompany.	2016-05-16 17:21:32 +02:00
florian HENRY	5d4db68b87	fix travis	2016-05-16 17:07:36 +02:00
florian HENRY	f8ac6c96e0	fix accountancy export	2016-05-16 17:05:34 +02:00
florian HENRY	b8d452596c	Fix : Advanced Accountancy module	2016-05-16 16:37:07 +02:00
Maxime Kohlhaas	af8608ab7a	Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES	2016-05-16 10:49:43 +02:00
Alexis Algoud	8d0e5479a0	Rename var	2016-05-14 19:22:27 +02:00
Alexis Algoud	e74e70287f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/product/stock/replenish.php	2016-05-14 19:14:39 +02:00
Alexis Algoud	b3b064d310	FIX hook on group card called but not initialized	2016-05-14 18:58:14 +02:00
BENKE Charlie	a1ce4000e1	NEW : Add list of billed ... Very usefull when we have many rappro Maybe do the same on other paiement	2016-05-14 10:14:10 +02:00
BENKE Charlie	0944463805	Add : rappro order list	2016-05-14 10:06:35 +02:00
Juanjo Menent	21b639ef16	Fix issues with entity control	2016-05-14 00:47:46 +02:00
Laurent Destailleur	cba0ef5693	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2016-05-14 00:44:38 +02:00
Laurent Destailleur	af38d03825	Clean copyright and libs	2016-05-13 23:22:39 +02:00
Laurent Destailleur	d980742b6c	Merge pull request #5057 from nka11/restler3.0.0RC6 ... Update Restler to 3.0.0RC6	2016-05-13 23:15:16 +02:00
Laurent Destailleur	ae16e6cdca	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-13 20:39:44 +02:00
Laurent Destailleur	6a0f16e9aa	FIX #5189	2016-05-13 20:39:31 +02:00
Laurent Destailleur	ab27815f21	Merge pull request #5194 from IonAgorria/dolresource-element ... Fix: Dolresource element type	2016-05-13 20:32:49 +02:00
Laurent Destailleur	7c26f328bb	Merge pull request #5190 from atm-ph/fix_3.8_update_ref_fourn_on_supplier_invoice ... Fix update supplier ref on supplier invoice	2016-05-13 20:29:09 +02:00
Laurent Destailleur	a5e3503598	Merge pull request #5187 from atm-gauthier/3.8_fix_param_fetch_company ... FIX : can't fetch by siret or siren because of first "if"	2016-05-13 20:28:46 +02:00
Laurent Destailleur	e885fe9f62	Merge pull request #5175 from grandoc/develop ... add column numbering name and fix a lot of issues within members list	2016-05-13 20:22:47 +02:00
Laurent Destailleur	d1d1b824b4	Better coding of #5181. I removed need of external lib.	2016-05-13 20:20:48 +02:00
Laurent Destailleur	8aebc37a5f	FIX Error message	2016-05-13 19:55:49 +02:00
philippe grand	45bdcd282a	add mobile search within member list	2016-05-13 19:24:55 +02:00
Laurent Destailleur	2308d28c19	FIX Add test code to detect/test autoload conflict	2016-05-13 19:23:56 +02:00
philippe grand	23cae18765	add phone perso search within member list	2016-05-13 19:06:28 +02:00
philippe grand	740b6819c7	add phone pro search within member list	2016-05-13 17:49:16 +02:00
philippe grand	cd801fe1dd	Merge remote-tracking branch 'upstream/develop' into develop	2016-05-13 14:51:07 +02:00
Laurent Destailleur	e6a95b2af9	Clean code	2016-05-13 14:28:37 +02:00
Laurent Destailleur	62b96b580a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-13 11:22:59 +02:00
Laurent Destailleur	986119d2b5	Start debug	2016-05-12 21:32:24 +02:00
Laurent Destailleur	55e904bc01	Debug for expert accounting module	2016-05-12 20:45:05 +02:00
Laurent Destailleur	a83a291856	Translation for one char	2016-05-12 19:55:36 +02:00
Laurent Destailleur	2b6029f5d3	FIX Some fix on stock. Condition to view warehouse as column and ... protection against infinite loop	2016-05-12 19:44:49 +02:00
Florian HENRY	4cbab1cf47	FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH	2016-05-12 16:58:14 +02:00
Ion Agorria	9b11907c70	Update existing linked elements to new type	2016-05-11 18:50:25 +02:00
Ion Agorria	788d499bf6	Change resource type to dolresource in class	2016-05-11 18:50:02 +02:00
nka11	c957cfc260	removing String class which cause server Error with php7	2016-05-11 13:22:58 +02:00
Florian HENRY	d3b3e60d82	Fix email template edition	2016-05-10 22:37:30 +02:00
phf	a57e0f5fd3	Fix update supplier ref on supplier invoice	2016-05-10 14:27:24 +02:00
Florian HENRY	1c0bdfcf1e	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-05-10 14:15:22 +02:00
gauthier	84e75eed88	FIX : can't fetch by siret or siren because of first "if"	2016-05-10 09:31:25 +02:00
Frédéric FRANCE	3607f1a296	Correction for Auguria Menu Accounting Expert ... Entry cause blank windows	2016-05-09 22:15:00 +02:00
Laurent Destailleur	ab6fbb1bca	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-05-09 19:37:58 +02:00
Laurent Destailleur	a8f50283c0	Fix bad translation	2016-05-09 19:37:14 +02:00
Maxime Kohlhaas	6278610d0a	Fix contract line creation should take desc even if not displayed on screen	2016-05-09 15:32:21 +02:00
Maxime Kohlhaas	03732fd1aa	Fix contract line creation was adding all proposal lines desc	2016-05-09 15:31:44 +02:00
Laurent Destailleur	1032583b02	Better support for accessiblity	2016-05-09 14:59:59 +02:00
Laurent Destailleur	9d3ad36b78	NEW If error is reported during migration process, you can ignore it to ... avoid to be locked.	2016-05-09 11:06:18 +02:00
Laurent Destailleur	29de09ad7c	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-05-09 08:53:38 +02:00
Laurent Destailleur	1835caad7b	Better translation	2016-05-09 08:53:09 +02:00
philippe grand	07a10743f8	Fix : inverted columns	2016-05-08 16:20:32 +02:00
philippe grand	f4a533bafa	Fix : when MAIN_VIEW_LINE_NUMBER is on	2016-05-08 16:09:00 +02:00
philippe grand	e8bd56a0d7	add new translation	2016-05-08 15:53:01 +02:00
Laurent Destailleur	698b93cf1e	FIX #5179	2016-05-08 12:38:30 +02:00
Laurent Destailleur	7c3c8f70be	Fix not initialized variables	2016-05-08 12:32:18 +02:00
Laurent Destailleur	5cf8612c58	Fix scrutinizer errors	2016-05-08 12:08:23 +02:00
Laurent Destailleur	0eb12f4c61	Fix scrutinizer	2016-05-08 11:39:37 +02:00
Laurent Destailleur	c8d98dbfdc	FIX error reported by scrutinizer	2016-05-08 11:33:46 +02:00
Laurent Destailleur	eaa548124b	Merge remote-tracking branch 'origin/3.9' into develop	2016-05-08 11:03:51 +02:00
Laurent Destailleur	7262dd5934	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-05-08 10:49:09 +02:00
Laurent Destailleur	cb4e569a5f	FIX Merge manually PR #5161 - Bad translation key	2016-05-08 10:48:55 +02:00
Laurent Destailleur	1f920bdb55	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-07 20:28:29 +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	606b7ef666	Revert "fix:erroneous form tag" ... This reverts commit 3093105cd0.	2016-05-07 20:18:46 +02:00
Laurent Destailleur	fe39b00074	Merge pull request #5172 from bafbes/abb-19 ... fix:erroneous form tag	2016-05-07 20:17:22 +02:00
Laurent Destailleur	0a5863d879	Merge pull request #5177 from simnandez/develop ... Fix: Remove unused variables	2016-05-07 20:16:01 +02:00
Laurent Destailleur	9311bb143c	Fix missing extrafields in list	2016-05-07 18:54:36 +02:00
Laurent Destailleur	3784af00ea	NEW Selection of fields is available on member list	2016-05-07 18:50:05 +02:00
Laurent Destailleur	47f27f353a	update list of member	2016-05-07 17:42:34 +02:00
Laurent Destailleur	5bee176ff8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-07 17:12:43 +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	25dfa0c5b9	Work on website	2016-05-07 16:38:32 +02:00
Juanjo Menent	ae6e233781	Merge pull request #5176 from Dolibarr/scrutinizer-patch-3 ... Scrutinizer Auto-Fixes	2016-05-07 00:49:57 +02:00
Juanjo Menent	e603118623	Merge pull request #5174 from frederic34/patch-7 ... put colspan in td instead tr	2016-05-07 00:46:58 +02:00
Juanjo Menent	156a5349c1	Merge pull request #5171 from atm-ph/fix_develop_delete_buy_price ... Fix no confirm window if we delete buying price	2016-05-07 00:46:05 +02:00
Juanjo Menent	bba986e975	Fix Remove unused variables	2016-05-06 23:35:56 +02:00
Juanjo Menent	fd6dbf5d1a	Fix Remove unused variables	2016-05-06 22:59:03 +02:00
Juanjo Menent	5f28070417	Fix Remove unused variables	2016-05-06 22:43:50 +02:00
Juanjo Menent	9e7e23a8ab	Fix Remove unused variables	2016-05-06 22:30:34 +02:00
Juanjo Menent	f73c8310fb	Merge remote-tracking branch 'upstream/develop' into develop	2016-05-06 22:13:03 +02:00
Juanjo Menent	47103fdac7	Fix Remove unused variables	2016-05-06 22:11:05 +02:00
Laurent Destailleur	d484383467	Minor errors	2016-05-06 22:06:23 +02:00
Laurent Destailleur	bf09e4a0b9	PHPdoc	2016-05-06 21:28:06 +02:00
Scrutinizer Auto-Fixer	9508d8a5c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-05-06 19:10:59 +00:00
Frédéric FRANCE	89684ce0f4	put colspan in td instead tr	2016-05-06 16:19:02 +02:00
abb	3093105cd0	fix:erroneous form tag	2016-05-06 11:20:07 +01:00
Laurent Destailleur	91d300289f	Minor fix in presentation	2016-05-06 12:15:44 +02:00
Laurent Destailleur	a05963ee2b	Better position for clear button	2016-05-06 11:22:58 +02:00
phf	0d03360375	Fix no confirm window if we delete buying price	2016-05-06 09:24:10 +02:00
Laurent Destailleur	5a75f346ff	Debug advanced selector	2016-05-06 00:02:22 +02:00
Laurent Destailleur	cdbbe8d87b	Minor fixes	2016-05-05 23:44:44 +02:00
Laurent Destailleur	f78bc16076	FIX Option 'onlypicto' was showing also the ref	2016-05-05 23:39:58 +02:00
Laurent Destailleur	2960fb6df7	FIX Option not tested everywhere	2016-05-05 23:28:22 +02:00
Laurent Destailleur	69f40c26ab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-05 23:19:32 +02:00
Laurent Destailleur	06d0c261ad	Add TODO comment	2016-05-05 23:19:21 +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	12cc1ad326	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-05 23:05:31 +02:00
Laurent Destailleur	0c6aaaaa3c	FIX #5168	2016-05-05 23:05:17 +02:00
Laurent Destailleur	31ef42c559	Merge pull request #5167 from frederic34/patch-10 ... Add "no order"	2016-05-05 23:01:16 +02:00
Laurent Destailleur	8bc0ef3afe	Merge pull request #5166 from frederic34/patch-9 ... put colspan in td instead tr	2016-05-05 22:56:17 +02:00
Laurent Destailleur	3eabcccdd9	Merge pull request #5165 from frederic34/patch-8 ... put colspan in td instead tr	2016-05-05 22:55:53 +02:00
Laurent Destailleur	7b5262cf92	Merge pull request #5159 from atm-alexis/develop_FIX_hook_expedition ... NEW hook addMoreActionsButtons in shipment card	2016-05-05 22:54:24 +02:00
Laurent Destailleur	816dda5a8b	Merge pull request #5158 from aspangaro/4.0-p29 ... FIX: Accountancy - Little fix et add page to assign massively the category	2016-05-05 22:52:20 +02:00
Laurent Destailleur	ed3e15b39e	Merge pull request #5150 from fmarcet/peru ... New: Add Perú regions	2016-05-05 22:48:02 +02:00
Laurent Destailleur	ec34b26562	Merge pull request #5148 from aspangaro/4.0-p27 ... FIX: Fiscal year - Some mistakes on card	2016-05-05 22:46:48 +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	a41403c594	Merge pull request #5144 from frederic34/patch-7 ... select engine for code 128 didn't work	2016-05-05 22:32:20 +02:00
Laurent Destailleur	db5cd36634	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-05 22:30:31 +02:00
Laurent Destailleur	8065e00795	FIX #5142	2016-05-05 22:30:08 +02:00
Laurent Destailleur	d39bd75c57	Merge pull request #5140 from aspangaro/3.9-p21 ... FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country	2016-05-05 22:27:51 +02:00
Laurent Destailleur	7e34581952	Merge pull request #5139 from aspangaro/4.0-p25 ... FIX: Accountancy - Chart of accounts are limited on only one country	2016-05-05 22:27:05 +02:00
Laurent Destailleur	ca37a90a1b	Better explanation	2016-05-05 22:26:42 +02:00
Laurent Destailleur	d2df537d43	Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project ... NEW allow a document to be linked to project from another customer	2016-05-05 22:24:32 +02:00
Laurent Destailleur	f901453a6b	FIX addMoreActionsButtons hook must be inside the div class=tabaction.	2016-05-05 21:38:29 +02:00
Laurent Destailleur	92f9919f97	Merge pull request #5116 from defrance/patch-3 ... Add addMoreActionsButtons Hook (standardisation)	2016-05-05 21:31:02 +02:00
Laurent Destailleur	10c7b167ea	Merge pull request #5115 from fappels/develop-new-warehouse-only-internal-status ... NEW prepare for additional warehouse statuses	2016-05-05 21:27:47 +02:00
Laurent Destailleur	9c00c7ff97	Merge pull request #5105 from atm-alexis/develop_NEW_details_per_warehouse_into_reassort ... NEW show detail per warehouse into reassort	2016-05-05 21:11:10 +02:00
Laurent Destailleur	d50e9cde34	Merge pull request #5090 from atm-maxime/fix_pdffoot_details ... PDF foot details	2016-05-05 21:09:46 +02:00
Laurent Destailleur	c795803da1	FIX ref_supplier was not set. We also refered to old var names.	2016-05-05 20:19:56 +02:00
Laurent Destailleur	8a8e7cdf5e	Merge pull request #4686 from bafbes/abb-10 ... New + Fix : handle supplier orders from customer orders with id variable name correction	2016-05-05 20:07:42 +02:00
Laurent Destailleur	461f62c200	Use the new global search form	2016-05-05 13:29:42 +02:00
Laurent Destailleur	5040fe46b0	FIX Missing number total of modules	2016-05-05 11:15:53 +02:00
Frédéric FRANCE	5c81feab7e	Add "no order"	2016-05-04 17:10:12 +02:00
Frédéric FRANCE	72695d1dee	put colspan in td instead tr	2016-05-04 17:02:58 +02:00
Frédéric FRANCE	2f3a2303d4	put colspan in td instead tr	2016-05-04 16:49:15 +02:00
Laurent Destailleur	b4e5acbaa9	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/product/class/product.class.php	2016-05-04 14:43:40 +02:00
Laurent Destailleur	568a43214d	Add code comment	2016-05-04 13:51:47 +02:00
Laurent Destailleur	cbbafb6432	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-05-04 13:50:17 +02:00
Laurent Destailleur	911e862a8e	Fix missing translation and add a TODO to avoid infinite loop.	2016-05-04 13:49:05 +02:00
Laurent Destailleur	7998cefdd2	Fix mark a deprecated function as deprecated	2016-05-04 13:15:00 +02:00
Laurent Destailleur	878ba07fcd	NEW The note on time spent can be entered when using the view per day.	2016-05-04 12:24:15 +02:00
Alexis Algoud	cefb5f6c6b	NEW hook in expedition card	2016-05-03 14:20:42 +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
Florian HENRY	fda5e6002f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/websites/index.php	2016-05-02 20:27:34 +02:00
aspangaro	e0f600f226	FIX: Accountancy - Little fix et add page to assign massively the category	2016-05-02 20:21:37 +02:00
aspangaro	7749425468	Modify right to access on chart of accounts	2016-05-02 20:02:45 +02:00
Laurent Destailleur	d69904c14d	Can set the home page of web sites	2016-05-02 15:51:18 +02:00
fmarcet	bc43c87f51	New: Add Perú regions	2016-05-02 11:36:29 +02:00
Laurent Destailleur	df4afdd663	NEW Can disable a module by renaming dir of module into module.disabled ... (this save time for maintenance when working with FTP).	2016-05-02 09:49:58 +02:00
Alexis Algoud	c2f4f2fd9c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_details_per_warehouse_into_reassort	2016-05-02 09:38:42 +02:00
Laurent Destailleur	5823055cdf	Work on website module.	2016-05-01 21:19:29 +02:00
Laurent Destailleur	46e2ed2810	NEW: All variant of ckeditor config can be tested into the setup page of ... module.	2016-05-01 20:36:42 +02:00
Laurent Destailleur	170dc467ff	Better code for website edition	2016-05-01 19:49:03 +02:00
aspangaro	1f015388b6	FIX: Fiscal year - Some mistakes on card	2016-05-01 17:04:55 +02:00
Laurent Destailleur	3045449dbb	Work on website module. Can delete a page.	2016-05-01 17:01:38 +02:00
Laurent Destailleur	f59f3032c6	NEW: Rename path for generic medias files into '/medias' instead of ... fckeditor. Add location of medias into title of media browser of ckeditor. Work on website module	2016-05-01 16:34:50 +02:00
Laurent Destailleur	87231908df	Fix missing object constructor	2016-05-01 11:07:05 +02:00
aspangaro	88435a0d80	NEW: Accountancy - Prepare multiple journals	2016-05-01 08:03:40 +02:00
Laurent Destailleur	f324c662c2	Better update of database cleaning non expected records.	2016-04-30 21:58:00 +02:00
Laurent Destailleur	50323afe94	Add comment	2016-04-30 21:33:18 +02:00
Laurent Destailleur	6a123c91b5	Solve warnings that appears because code is using statically a mehtod ... that can't be static yet.	2016-04-30 19:30:28 +02:00
Frédéric FRANCE	ffd80e3f8f	select engine for code 128 didn't work	2016-04-30 18:56:16 +02:00
Laurent Destailleur	9c855f3a5e	Start to work to have custom dir available and active by default.	2016-04-30 17:11:48 +02:00
Laurent Destailleur	a8363052c6	Better style	2016-04-30 15:55:39 +02:00
Laurent Destailleur	de59d115d9	Option THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT and ... THIRDPARTY_SUPPLIER_BY_DEFAULT to have fields customer/prospect/supplier set when creating a new thirdparty.	2016-04-30 14:59:40 +02:00
frederic34	17463b4927	categories account like other categories	2016-04-30 14:45:24 +02:00
Laurent Destailleur	e61e717cac	FIX Bad permission to edit bank account on customer invoice	2016-04-30 14:28:48 +02:00
Laurent Destailleur	f747018fb6	Clean dead code ... FIX when editing price with tax, reset price without so i will be recalculated.	2016-04-30 14:24:33 +02:00
Laurent Destailleur	97bf91cc5d	Show both currency symbol and code	2016-04-30 14:09:00 +02:00
Laurent Destailleur	6ffb45f5d8	FIX Missing param user on update()	2016-04-30 13:58:35 +02:00
Laurent Destailleur	9e24abacac	Missing translation load	2016-04-30 13:26:31 +02:00
aspangaro	e6843a64ae	FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country	2016-04-30 07:13:23 +02:00
aspangaro	3cf1d891ab	FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country	2016-04-30 07:05:10 +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	e717baefe5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-30 01:43:44 +02:00
Laurent Destailleur	4e9ea2786a	Fix s	2016-04-30 01:43:34 +02:00
BENKE Charlie	379a621b1f	soory it's a mistake	2016-04-30 01:01:32 +02:00
Laurent Destailleur	1bfc7e9b70	Merge pull request #5104 from fappels/patch-1 ... Update product.class.php	2016-04-30 00:28:22 +02:00
Laurent Destailleur	019398857a	Merge pull request #5099 from aspangaro/4.0-p24 ... FIX: Accountancy - Upgrade Cegid Bank export	2016-04-30 00:27:36 +02:00
Laurent Destailleur	e8bd1357f3	More help to use REST API	2016-04-30 00:00:59 +02:00
aspangaro	35c87972bb	Merge remote-tracking branch 'Upstream/develop' into 4.0-p24	2016-04-29 20:47:52 +02:00
Laurent Destailleur	0cde6ad98f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/filefunc.inc.php	2016-04-29 20:43:42 +02:00
Laurent Destailleur	3d9456b202	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/facture/list.php	2016-04-29 20:42:35 +02:00
Laurent Destailleur	755b994750	Prepare 3.9.2	2016-04-29 20:40:00 +02:00
Laurent Destailleur	53386e22ea	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/expedition/class/expedition.class.php htdocs/index.php	2016-04-29 20:39:17 +02:00
Laurent Destailleur	0735413e7c	Merge pull request #5101 from altatof/fix_fournprice_select ... FIX: end of select when no fournprice	2016-04-29 20:36:44 +02:00
Laurent Destailleur	04f4a99684	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-29 20:35:50 +02:00
Laurent Destailleur	3c927fbe0e	Debug website module	2016-04-29 20:35:38 +02:00
Laurent Destailleur	d7ea8139fe	Merge pull request #5103 from fappels/develop-fix-societe-update ... Fix #5100 Develop unable to create new third party	2016-04-29 20:22:03 +02:00
BENKE Charlie	49c3c69e30	minor error code	2016-04-29 20:20:47 +02:00
Laurent Destailleur	f5df6488db	Merge pull request #5094 from defrance/patch-2 ... minor error code	2016-04-29 20:18:55 +02:00
BENKE Charlie	31a9acc77d	</option> not present in some select list	2016-04-29 20:18:26 +02:00
Laurent Destailleur	db4024035e	Merge pull request #5092 from defrance/patch-1 ... </option> not present in some select list	2016-04-29 20:17:56 +02:00
esprit libre	f5a541d469	Fix problem about unit buy price fetching ... To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-29 19:41:47 +02:00
Laurent Destailleur	b17b30f5a2	Merge pull request #5114 from esprit-libre/develop ... FIX When buy price not explicetly defined, it is return by defineBuyPrice function that return total price instead of unit price	2016-04-29 19:40:29 +02:00
Laurent Destailleur	5d1dbdb82c	Merge pull request #5089 from atm-maxime/fix_slect_ziptown ... Fix country and state were not properly updated after ziptown selection	2016-04-29 19:26:40 +02:00
Laurent Destailleur	0ed998af03	Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN""	2016-04-29 19:01:38 +02:00
Laurent Destailleur	3a74946210	Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"	2016-04-29 18:59:54 +02:00
Laurent Destailleur	ea924df4c5	Merge pull request #5080 from marcosgdf/bug-4813 ... FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN	2016-04-29 18:59:52 +02:00
Laurent Destailleur	b94295e4ca	Merge pull request #5102 from atm-alexis/3.8 ... FIX search on date into supplier invoice list	2016-04-29 18:45:04 +02:00
Laurent Destailleur	b434dad21a	Fix: remove a debug code	2016-04-29 18:34:56 +02:00
Laurent Destailleur	cea1c06f7d	Merge pull request #4764 from benlo06/fr_4763 ... FR4763 add possibility to export contacts/thirdparty categories	2016-04-29 18:33:58 +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
Alexis Algoud	e5b6d39e51	NEW allow a document to be linked to project from another customer on config	2016-04-29 18:04:59 +02:00
Laurent Destailleur	466404d968	Fix missing dol_fiche_xxx	2016-04-29 17:58:39 +02:00
Laurent Destailleur	26b4a5a1e0	Merge pull request #4267 from bafbes/patch-12 ... allow cherry-pick of a sub-menu by changing its parent identifier	2016-04-29 17:55:29 +02:00
Laurent Destailleur	14838d222b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-29 17:53:29 +02:00
Laurent Destailleur	8fe799f424	Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr ... into aternatik-dol_resource Conflicts: dev/initdata/img/printcompany.png htdocs/compta/bank/card.php	2016-04-29 17:51:11 +02:00
Laurent Destailleur	b0977e3e2a	Merge pull request #5122 from fmarcet/3.8 ... FIX: Not filtering correctly when come from dashboard	2016-04-29 17:40:03 +02:00
Laurent Destailleur	59a30cd2e7	Merge pull request #5120 from atm-maxime/fix_total_on_cabyprodserv ... Fix wrong qty total in ca by prod/serv report	2016-04-29 17:39:40 +02:00
Laurent Destailleur	9a1cff99cc	Merge pull request #5123 from fmarcet/3.9 ... FIX: Not filtering correctly when coming from dashboard	2016-04-29 17:20:10 +02:00
Laurent Destailleur	b0b1056a44	Merge pull request #5121 from fmarcet/3.7 ... Fix: Not filtering correctly on supplier invoice's list	2016-04-29 17:19:15 +02:00
Laurent Destailleur	88842ccd8b	Merge pull request #5111 from nka11/api_improvement ... Api improvement	2016-04-29 17:13:02 +02:00
Laurent Destailleur	bec4c58732	Merge pull request #5133 from olsesacl/develop-bug-module-cronjob ... FIX Bug insert cronjobs in modules, default values	2016-04-29 17:11:58 +02:00
Laurent Destailleur	3c2c9a25b8	Merge pull request #5130 from frederic34/patch-9 ... FIX if type fee not specified, line is invisible and can't edit it	2016-04-29 17:11:14 +02:00
Laurent Destailleur	84a39f41d6	Merge pull request #5125 from frederic34/patch-7 ... FIX Load user personal param at login. This cause boxes disordered at login time.	2016-04-29 17:10:41 +02:00
Laurent Destailleur	f4224881c3	Merge pull request #5132 from frederic34/patch-11 ... FIX keep files attached with PROV status	2016-04-29 17:08:22 +02:00
Laurent Destailleur	8a4871323d	Merge pull request #5022 from marcosgdf/bug-5008 ... FIX #5008 SQL error when editing the reference of a supplier invoice that already exists	2016-04-29 17:01:01 +02:00
Laurent Destailleur	174cead40d	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/commande/list.php	2016-04-29 15:33:57 +02:00
Frédéric FRANCE	7e8aef037a	Update expensereport.class.php	2016-04-29 13:23:06 +02:00
Sergio Sanchis Climent	cd4e104b76	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop ... Conflicts: htdocs/product/card.php	2016-04-29 12:39:00 +02:00
Frédéric FRANCE	a982f764fe	don't change ref if ref is not prov	2016-04-29 12:26:41 +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	6d58103d11	Merge pull request #5091 from marcosgdf/fr-4972 ... NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page	2016-04-29 12:03:04 +02:00
Juanjo Menent	206dee7106	Merge pull request #5086 from aspangaro/4.0-p23 ... NEW: Loan - Add list to select accounting account in admin	2016-04-29 12:01:44 +02:00
Juanjo Menent	08a875b813	Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list ... New add remain to pay column in invoice list	2016-04-29 12:00:53 +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
Juanjo Menent	a33df1401b	Merge pull request #5079 from marcosgdf/fix-undefined-variable ... Fixed undefined $user variable in Account::countAccountToReconcile	2016-04-29 11:58:48 +02:00
Juanjo Menent	143a70c893	Merge pull request #5078 from atm-maxime/new_stats_on_home ... New stats on home (contacts and interventions)	2016-04-29 11:57:44 +02:00
Juanjo Menent	9909143c42	Merge pull request #5076 from aspangaro/4.0-p21 ... FIX: For external api, don't use lengt_accountg without module accountancy activated	2016-04-29 11:55:55 +02:00
Florian HENRY	b01c7572f7	FIX travis	2016-04-29 10:21:39 +02:00
Florian HENRY	6ff71792a0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-29 09:00:42 +02:00
Sergio Sanchis Climent	61fda99fc5	FIX Bug insert cronjobs in modules, default values	2016-04-29 01:13:10 +02:00
Frédéric FRANCE	ab63bdd235	keep files attached with PROV status	2016-04-28 22:30:22 +02:00
Frédéric FRANCE	c743f6cfe5	If no project, update line is impossible	2016-04-28 21:56:28 +02:00
Frédéric FRANCE	972e5e571d	Update card.php	2016-04-28 21:52:23 +02:00
Laurent Destailleur	2ea5bf3d5e	FIX: Pre selected value was not used on supplier list ouput	2016-04-28 20:04:48 +02:00
Laurent Destailleur	0419987b6f	NEW Add view of virtual stock into product list (when appropriate)	2016-04-28 15:22:38 +02:00
Florian HENRY	b280a700d2	FIX missing column when module was installed before standard integration	2016-04-28 14:05:56 +02:00
Florian HENRY	e698c410f5	FIX Postgres migration from 3.9 to 4.0	2016-04-28 13:56:17 +02:00
Frédéric FRANCE	4404197597	Load user personal param at login	2016-04-28 11:54:42 +02:00
fmarcet	33499ae652	FIX: Compatible with multicompany	2016-04-28 11:14:00 +02:00
Sergio Sanchis Climent	32d641b66b	Bug show product if no accounting enabled	2016-04-28 11:12:04 +02:00
Laurent Destailleur	608c93702d	FIX Can't create a stock transfer from product card	2016-04-28 11:05:34 +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
fmarcet	e96e0f637a	FIX: Not filtering correctly when come from dashboard	2016-04-28 10:41:37 +02:00
fmarcet	d599261d20	FIX: Not filtering correctly when come from dashboard	2016-04-28 10:38:50 +02:00
Florian HENRY	717eaa3d81	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/websites/class/websitepage.class.php	2016-04-28 10:32:31 +02:00
Ferran Marcet	7380676717	Fix: Not filtering correctly on supplier invoice's list	2016-04-28 10:25:55 +02:00
Maxime Kohlhaas	0a67614e72	Fix wrong qty total in ca by prod/serv report	2016-04-28 09:10:22 +02:00
nka11	b03199606a	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6	2016-04-28 08:34:18 +02:00
nka11	932b9837fe	Merge branch 'fix_5053' into api_improvement	2016-04-28 08:31:10 +02:00
nka11	ce0436b809	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053	2016-04-28 08:30:33 +02:00
BENKE Charlie	8a63298102	Missing addMoreActionsButtons hook	2016-04-27 22:19:38 +02:00
BENKE Charlie	520facd55e	Missing addMoreActionsButtons hook	2016-04-27 22:17:45 +02:00
Laurent Destailleur	aa31a7e9c5	Finished list of template invoices	2016-04-27 20:09:55 +02:00
Laurent Destailleur	7608366e70	Fix pagination	2016-04-27 19:34:38 +02:00
Laurent Destailleur	9987c9b77a	Can sort on field of recurring invoices	2016-04-27 17:36:05 +02:00
Laurent Destailleur	7770d95b18	FIX PHPCS	2016-04-27 16:56:09 +02:00
fappels	65ea83fa06	NEW prepare for additional warehouse statuses ... Add additional warehouse statuses, so you can add extra filter possibility. For example hide warehouses with damaged stock from shipping. Feature is still hidden by conf ENTREPOT_EXTRA_STATUS Still TODO: config all $formproduct->selectWarehouses	2016-04-27 16:51:51 +02:00
esprit libre	75a9178549	Fix problem about unit buy price fetching ... To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-27 16:42:59 +02:00
Laurent Destailleur	39bc4d5f02	Optimize load_stock and load_stock_virtual	2016-04-27 14:19:06 +02:00
Laurent Destailleur	c6371060d0	FIX Stock limit for alert added into list of available fields for stock	2016-04-27 14:05:35 +02:00
Laurent Destailleur	810a6c2cb4	Better explanation	2016-04-27 13:39:54 +02:00
Laurent Destailleur	77fcbd3884	FIX: init var at wrong place report incorrect "shippable" flag on draft ... order.	2016-04-27 12:34:52 +02:00
Laurent Destailleur	2beb16ef32	Remove limit on product ref on replenishment	2016-04-27 12:30:36 +02:00
Laurent Destailleur	bb91fb174b	FIX: init var at wrong place report incorrect "shippable" flag on draft ... order.	2016-04-27 12:30:00 +02:00
Laurent Destailleur	60e693e9a4	Minor fixes on recurring invoices	2016-04-27 11:35:11 +02:00
Laurent Destailleur	bdb7fe8d29	Missing public note on recurring invoices ... Can change position of lines in recurring invoices	2016-04-27 11:07:20 +02:00
Laurent Destailleur	11217db8c4	FIX: when creating project from template/recurring invoice creation, we ... lost information we were working in template/recurring invoice.	2016-04-27 10:56:40 +02:00
nka11	19e223e84b	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_improvement	2016-04-27 09:43:00 +02:00
Florian HENRY	1d75c5f720	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/commonobject.class.php	2016-04-27 09:41:42 +02:00
Florian HENRY	bfbb1c20bc	FIX bug on email template	2016-04-27 09:27:59 +02:00
nka11	98f757a87a	New API methods ... add user to group get product list by category id	2016-04-27 08:59:12 +02:00
Laurent Destailleur	78cda5dc07	Fix problem with code of reccuring invoices	2016-04-26 22:00:41 +02:00
Florian HENRY	b82a216879	fix confilct	2016-04-26 14:21:40 +02:00
Florian HENRY	8d91523619	NEW : Enabled feature hidden extrafeilds	2016-04-26 14:17:20 +02:00
Florian HENRY	c7a9f26ee5	NEW : continue hidden extrafield feature	2016-04-26 14:17:19 +02:00
Laurent Destailleur	56b57b0bc9	Code comment	2016-04-26 13:37:09 +02:00
Laurent Destailleur	66ea799eb7	Uniformize code and add more comment to understand workflow	2016-04-26 13:27:32 +02:00
Laurent Destailleur	714b5556f3	FIX if qty to ship is < 0, we sugest 0	2016-04-26 13:13:18 +02:00
Laurent Destailleur	4758c82d41	Solve minor translation	2016-04-26 09:45:19 +02:00
nka11	c8432fcccd	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6	2016-04-26 07:37:58 +02:00
nka11	56d25a7c2b	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053	2016-04-26 07:31:00 +02:00
Alexis Algoud	91bea8b9fe	fix inclusion	2016-04-25 18:54:28 +02:00
Alexis Algoud	bf1f805bf6	FIX trad	2016-04-25 18:40:38 +02:00
Alexis Algoud	b46c14812c	Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop	2016-04-25 18:37:47 +02:00
Alexis Algoud	b472a244db	NEW decrease stock on expedition closing/classifying	2016-04-25 18:33:39 +02:00
Alexis Algoud	7658a86bc9	NEW show detail per warehouse into reassort	2016-04-25 15:34:54 +02:00
Francis Appels	11c31667b8	Update product.class.php ... Fix updatePrice syslog. Is travis still running phpunit tests?	2016-04-25 15:04:33 +02:00
fappels	6bf52558e4	Fix #5100 Develop unable to create new third party ... Only set fk_stcomm if available Do not set 'null' into float databasefield	2016-04-25 12:13:28 +02:00
Christophe Battarel	2a0c508d47	FIX: end of select when no fournprice	2016-04-25 11:26:13 +02:00
Alexis Algoud	1746f8f96c	FIX search on date into supplier invoice list dont work because of status -1	2016-04-25 11:25:49 +02:00
Laurent Destailleur	c73f4e5d7b	FIX Project was lost when creating invoice from a template ... Can set project on invoice during creation of invoice from a template Replace duplicated code to show lines with mutualized code	2016-04-24 20:00:00 +02:00
Laurent Destailleur	ccdbf69cd5	Bette explanation on how to create an repeatable invoice	2016-04-24 18:11:19 +02:00
aspangaro	d0b2068ab1	FIX: Accountancy - Upgrade Cegid Bank export	2016-04-24 14:41:14 +02:00
Maxime Kohlhaas	02aa3f5688	Debug double conf	2016-04-24 12:14:03 +02:00
nka11	8b92e552a3	fix #5053 and bogus 051c5f4	2016-04-24 09:55:19 +02:00
aspangaro	f5c1406beb	FIX: Accountancy - Fix on bank journal to support subcription	2016-04-24 06:10:15 +02:00
BENKE Charlie	dde4f7ed85	minor error code	2016-04-24 02:01:29 +02:00
Laurent Destailleur	bcb4b2b607	Work on website module	2016-04-23 21:34:10 +02:00
BENKE Charlie	961c086be3	</option> not present in some select list	2016-04-23 20:17:45 +02:00
Marcos García de La Fuente	82ee964c27	NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page ... Close #4972	2016-04-23 18:22:11 +02:00
Maxime Kohlhaas	651213123f	Oups missing $conf	2016-04-23 17:45:38 +02:00
Maxime Kohlhaas	2c6f58e689	Add choices in PDF admin page	2016-04-23 17:37:12 +02:00
Maxime Kohlhaas	930b4a9be0	New var name	2016-04-23 17:36:55 +02:00
Laurent Destailleur	1a883d870b	Uniformize style	2016-04-23 17:35:33 +02:00
Maxime Kohlhaas	ad26fb2824	New option to show details in pdf page foot	2016-04-23 17:23:44 +02:00
Maxime Kohlhaas	0358db0065	Fix use of details in pdf foot	2016-04-23 17:10:56 +02:00
Laurent Destailleur	9d21b63562	Beautify a page	2016-04-23 16:55:08 +02:00
Laurent Destailleur	00a658143d	NEW List of user in agenda view per user show photo thumb	2016-04-23 16:51:22 +02:00
Maxime Kohlhaas	179022b129	Fix country and state were not properly updated after ziptown selection	2016-04-23 16:49:43 +02:00
aspangaro	c652d5b02d	NEW: Loan - Add list to select accounting account in admin	2016-04-23 16:06:33 +02:00
Maxime Kohlhaas	c5787a4bba	New add remain to pay column in invoice list (was present in previous versions)	2016-04-23 16:02:18 +02:00
aspangaro	1454f5cafa	FIX: Accountancy - Table account integer 0 by default	2016-04-23 15:44:31 +02:00
aspangaro	04fd5a20ef	FIX: Accountancy Work on categories for Report - Add french example	2016-04-23 15:43:28 +02:00
Laurent Destailleur	b639849a47	Page for proposals must be called card.php (one of last architecture ... change before the freeze)	2016-04-23 15:37:22 +02:00
Marcos García de La Fuente	d98e50e661	Little change	2016-04-23 13:44:43 +02:00
Marcos García de La Fuente	867649e922	FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN ... Close #4813	2016-04-23 13:36:12 +02:00
Marcos García de La Fuente	f195107bd1	Fixed undefined $user variable in Account::countAccountToReconcile	2016-04-23 13:25:23 +02:00
Maxime Kohlhaas	4e42e73f60	New add stats on interventions	2016-04-23 13:16:19 +02:00
Maxime Kohlhaas	df4d016684	New add stats on contacts	2016-04-23 13:06:46 +02:00
aspangaro	2a7c7a0748	Same problem on bank	2016-04-23 08:09:38 +02:00
aspangaro	8f9c3f96cf	Merge remote-tracking branch 'Upstream/develop' into 4.0-p21	2016-04-23 07:07:15 +02:00
aspangaro	a8aeba3ade	FIX: For external api, don't use lengt_accountg without module accountancy activated	2016-04-23 07:05:16 +02:00
Laurent Destailleur	5bfc65676c	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/theme/eldy/style.css.php	2016-04-22 21:02:20 +02:00
Laurent Destailleur	3278c8245b	Merge pull request #5020 from frederic34/swiftmailer ... Add Swift Mailer to send mails	2016-04-22 20:12:58 +02:00
Laurent Destailleur	361bba4eb2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-22 20:01:14 +02:00
Laurent Destailleur	051c5f415e	Fix API access protection check #5053	2016-04-22 20:00:37 +02:00
Laurent Destailleur	284622edbd	Merge pull request #5062 from bafbes/abb-18 ... fix:missing quote in query in commonobject updatefield function	2016-04-22 19:51:11 +02:00
Laurent Destailleur	3d4ddcb29e	Merge pull request #5065 from atm-maxime/fix_supplier_order_log ... Fix log function was removed in 1b6fa8ec34	2016-04-22 19:45:36 +02:00
Laurent Destailleur	230807b292	Merge pull request #5056 from frederic34/patch-10 ... FIX If oauth has never been activated two tables are missing and printing is not working	2016-04-22 19:42:21 +02:00
Laurent Destailleur	7e047ada2b	Merge pull request #5064 from aspangaro/4.0-p21 ... FIX: Accountancy - Road to stable version	2016-04-22 19:21:18 +02:00
Laurent Destailleur	63d04f4f2d	Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client ... Fix order creation bug because of ->client	2016-04-22 19:20:48 +02:00
Laurent Destailleur	fb53b41078	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-22 19:20:04 +02:00
Laurent Destailleur	da14f247bb	Merge pull request #5070 from atm-maxime/fix_display_payment_on_invoices ... Fix payment display on customer invoice and replicate on supplier inv…	2016-04-22 19:19:46 +02:00
Laurent Destailleur	031bcb41e3	Merge pull request #5073 from atm-maxime/fix_menu_bank ... Fix bank submenu error	2016-04-22 19:13:53 +02:00
Laurent Destailleur	ec407af81a	Merge pull request #5072 from atm-maxime/fix_bank_releve_display ... Fix bank statement display	2016-04-22 19:12:56 +02:00
Laurent Destailleur	bcc0f0c488	Merge pull request #5067 from grandoc/develop ... Fix : missing translation	2016-04-22 19:12:36 +02:00
Laurent Destailleur	4958c13691	Merge pull request #5069 from atm-maxime/new_contact_gender ... New contact gender according to civility	2016-04-22 19:11:54 +02:00
Laurent Destailleur	0a55534da8	Merge pull request #5059 from frederic34/patch-7 ... Update 3.9.0-4.0.0.sql	2016-04-22 19:08:04 +02:00
Laurent Destailleur	bfc5be1aad	FIX Fix and move dolGetFirstLine function into main ... FIX Hang on ->client not defined	2016-04-22 19:07:32 +02:00
Laurent Destailleur	467662143f	Merge pull request #5046 from bafbes/abb-17 ... fix:use of function updateExtrafield instead of insertExtrafields in interventions	2016-04-22 18:31:14 +02:00
Laurent Destailleur	1de36d6501	Merge pull request #5011 from altatof/supplierorder_noprice ... NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-04-22 18:27:42 +02:00
Laurent Destailleur	241e765829	Merge pull request #5047 from hregis/3.9_bug ... Fix: broken multicompany transverse mode authentication feature	2016-04-22 18:24:17 +02:00
Laurent Destailleur	a99b7ddee6	Fix PHPCS	2016-04-22 18:12:31 +02:00
Laurent Destailleur	0ef1be9364	Prepare 3.9.1	2016-04-22 18:07:34 +02:00
Laurent Destailleur	25b7f0ab62	FIX Remove a total that has no sense	2016-04-22 17:11:12 +02:00
Laurent Destailleur	2cc24db6a2	Fix typo	2016-04-22 13:45:54 +02:00
Laurent Destailleur	c939273fd5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-22 13:38:56 +02:00
Laurent Destailleur	366db31a9e	Make css more simple	2016-04-22 13:38:44 +02:00
Laurent Destailleur	7515b2ba7b	NEW Add a parameter on graph function to show a generic graph when no ... data are available.	2016-04-22 12:11:57 +02:00
Maxime Kohlhaas	72ef11f593	Fix bank submenu error	2016-04-22 11:59:55 +02:00
Maxime Kohlhaas	5904f33039	Fix bank statement display	2016-04-22 11:44:23 +02:00
Laurent Destailleur	ff5f04dee1	Removed not required directories	2016-04-22 11:11:24 +02:00
Laurent Destailleur	78d18185e4	Several css enhancements	2016-04-22 11:11:08 +02:00
Laurent Destailleur	d735f5dc70	FIX lost css change	2016-04-22 11:10:20 +02:00
Laurent Destailleur	a10d97cce0	NEW Can filter on status employee when building emailing from users	2016-04-22 11:09:31 +02:00
Maxime Kohlhaas	fc7056650e	Fix payment display on customer invoice and replicate on supplier invoice	2016-04-22 10:42:06 +02:00
Maxime Kohlhaas	7dd8eba29e	New contact gender according to civility	2016-04-22 10:30:13 +02:00
Maxime Kohlhaas	e881701968	Fix pdf generation with thirdparty	2016-04-22 09:46:47 +02:00
philippe grand	0c7d7245a8	missing translation	2016-04-22 09:37:35 +02:00
Maxime Kohlhaas	4bd239060c	Fix order creation bug because of ->client	2016-04-22 09:18:09 +02:00
Maxime Kohlhaas	bea8b49d8c	Fix log function was removed in 1b6fa8ec34	2016-04-22 09:02:40 +02:00
aspangaro	df91a95b9b	FIX: Add right to manage chart of accounts for non-admin	2016-04-22 07:05:24 +02:00
aspangaro	24fddaa039	Hidden old functions	2016-04-22 06:58:18 +02:00
aspangaro	4a078db060	FIX: Migration script	2016-04-22 06:57:37 +02:00
aspangaro	8f3a254259	FIX: Bug with category functionnality	2016-04-22 06:31:40 +02:00
abb	a0f57e6a91	fix:add escape function to query in updatefield function	2016-04-21 14:49:46 +01:00
abb	4406cfcbb8	fix:missing quote in query in updatefield function	2016-04-21 14:32:51 +01:00
Frédéric FRANCE	adde434708	Update 3.9.0-4.0.0.sql	2016-04-21 08:52:10 +02:00
Philippe-OpenDSI	2fc876f607	FIX #5048 Product supplier list display only one produc ... Last parameter of select_produits_fournisseurs_list is $limit, not $socid	2016-04-21 08:41:45 +02:00
nka11	b60389cec4	Update Restler to 3.0.0RC6	2016-04-21 08:13:19 +02:00
Frédéric FRANCE	fd9fb505b9	Update printgcp.modules.php	2016-04-21 07:53:22 +02:00
Laurent Destailleur	2d558174f2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-21 03:19:07 +02:00
Laurent Destailleur	c2de7adb32	Minor PHPCS fixes	2016-04-21 03:18:42 +02:00
Laurent Destailleur	7adf3a4789	Merge pull request #5043 from bafbes/abb-15 ... new function updateExtraField to update one particular extrafield	2016-04-21 02:58:39 +02:00
Laurent Destailleur	bcbffe3a4a	Merge pull request #5037 from frederic34/patch-9 ... Update style.css.php	2016-04-21 02:54:07 +02:00
Laurent Destailleur	d9e846e586	Update migrate script	2016-04-21 02:47:34 +02:00
Laurent Destailleur	dd443fe7f5	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/compta/localtax/quadri_detail.php	2016-04-21 02:42:43 +02:00
Laurent Destailleur	8a6d97f257	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-21 02:39:37 +02:00
Laurent Destailleur	ffd10a7560	Complete function loadExpedition to add filter on fk_product	2016-04-21 02:38:49 +02:00
Laurent Destailleur	d347595d86	Merge pull request #5041 from aspangaro/4.0-p20 ... FIX: Accounting library already declared in line 54	2016-04-21 01:57:44 +02:00
placid0w	d043c9ce80	Fix #5054	2016-04-21 01:56:36 +02:00
Philippe-OpenDSI	e3e2b87506	Product supplier list display only one product ... Last parameter of select_produits_fournisseurs_list is $limit, not $socidif	2016-04-21 01:55:35 +02:00
Laurent Destailleur	b032280d07	Merge pull request #5049 from philippe-opendsi/develop ... FIX #5048 Product supplier list display only one product	2016-04-21 01:54:36 +02:00
Laurent Destailleur	ff140914c8	Merge pull request #5050 from FHenry/3.9 ... FIX : When cloning an order the order result from clone must be now	2016-04-21 01:50:15 +02:00
Laurent Destailleur	1e5ff7388c	Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client ... NEW Removed deprecated CommonObject::client property	2016-04-21 01:49:12 +02:00
Laurent Destailleur	533391f846	Merge pull request #5030 from frederic34/patch-7 ... FIX Using $user that was not imported	2016-04-21 01:25:59 +02:00
Laurent Destailleur	429be4678c	Merge pull request #5045 from bafbes/abb-16 ... fix:erroneous nesting form	2016-04-21 01:23:37 +02:00
Laurent Destailleur	3ba87be4ef	Merge pull request #5029 from marcosgdf/deprecated-functions ... NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions	2016-04-21 01:18:22 +02:00
Laurent Destailleur	4b401a03c8	Merge pull request #5028 from marcosgdf/fr-4524 ... NEW Renamed ActionComm::add function to ActionComm::create	2016-04-21 01:16:46 +02:00
Laurent Destailleur	30f7d4cd52	Merge pull request #5027 from marcosgdf/refactor-option ... Refactored Form classes to use Form::selectarray instead of HTML code	2016-04-21 01:15:59 +02:00
Frédéric FRANCE	e1d55d280e	Update printgcp.modules.php	2016-04-20 22:29:27 +02:00
placid0w	7bf9c2144e	Fix #5054	2016-04-20 15:43:14 -03:00
Florian HENRY	79f408feeb	FIX : When cloning an order the order result from clone must be now	2016-04-20 17:17:03 +02:00
Philippe-OpenDSI	c298b783ce	Product supplier list display only one product ... Last parameter of select_produits_fournisseurs_list is $limit, not $socidif	2016-04-20 13:59:13 +02:00
Laurent Destailleur	fb5497f3d6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-19 19:52:37 +02:00
Laurent Destailleur	6d2df1f6ea	Merge pull request #5007 from altatof/fichinter_order_by_date ... NEW: fichinter lines ordered by rang AND DATE	2016-04-19 19:26:57 +02:00
Laurent Destailleur	349c1c2d69	Merge pull request #4999 from fappels/develop ... Fix migration script	2016-04-19 19:22:37 +02:00
Laurent Destailleur	0c932e0ee6	Merge pull request #4997 from atm-maxime/fix_vat_on_credit_note ... Fix VAT amount on credit note was > 0 when manually entered	2016-04-19 19:21:05 +02:00
Laurent Destailleur	39c68c302e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-19 19:15:55 +02:00
Laurent Destailleur	08c379ad58	Fix submit photo is no more hidden on smartphone.	2016-04-19 19:15:31 +02:00
Laurent Destailleur	005751f330	Merge pull request #4963 from altatof/add_filter_type_on_turnover_report ... NEW: add product type filter on turnover report	2016-04-19 19:15:04 +02:00
Laurent Destailleur	da329131bb	Merge pull request #4959 from nka11/api_dev ... API Improvements	2016-04-19 19:13:57 +02:00
Laurent Destailleur	d40e659b30	Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring ... NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown	2016-04-19 19:11:54 +02:00
Laurent Destailleur	4619040983	Work on website module	2016-04-19 18:41:05 +02:00
frederic34	1a552cbd16	typo	2016-04-19 18:27:56 +02:00
Regis Houssin	0a52abab5d	Fix: broken multicompany transverse mode authentication feature	2016-04-19 13:38:32 +02:00
Fixit Management	c3a5a7aab8	Rollback modification in this file	2016-04-19 12:54:46 +02:00
Fixit Management	ee9f1f32c1	Update conf	2016-04-19 12:43:50 +02:00
Fixit Management	5778ba0bd8	Merge remote-tracking branch 'upstream/develop' into fr_4763	2016-04-19 12:31:05 +02:00
abb	c77e121553	fix:use of function updateExtrafield instead of insertExtrafields in interventions	2016-04-19 08:17:57 +01:00
abb	e673c1aad9	fix:erroneous nested form	2016-04-19 08:08:35 +01:00
abb	62aa628524	fixmycommit:new function updateExtraField to update one particular extrafield	2016-04-19 07:49:05 +01:00
abb	f0f4933905	new function updateExtraField to update one particular extrafield ... Conflicts: htdocs/core/class/commonobject.class.php	2016-04-19 07:47:29 +01:00
aspangaro	bb554a73bd	FIX: Accounting library already declared in line 54	2016-04-19 06:18:34 +02:00
Laurent Destailleur	cb1772b527	Fix too much code removed. We still need JQUERY LAYOUT for ECM module.	2016-04-19 01:45:45 +02:00
Laurent Destailleur	448ca49e28	Fix bad field	2016-04-18 21:10:30 +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
Juanjo Menent	b236612975	Merge pull request #5038 from frederic34/patch-10 ... Update 3.9.0-4.0.0.sql	2016-04-18 20:15:17 +02:00
Juanjo Menent	48407da37b	Merge pull request #5039 from frederic34/patch-11 ... Update rappro.php	2016-04-18 20:14:44 +02:00
nka11	39948968eb	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev	2016-04-18 19:13:06 +02:00
nka11	4eb1aa59aa	fix coding rules	2016-04-18 19:11:28 +02:00
Frédéric FRANCE	18b3b3a31d	Update rappro.php	2016-04-18 08:14:02 +02:00
Frédéric FRANCE	c6226e63b7	Update 3.9.0-4.0.0.sql	2016-04-18 08:13:01 +02:00
Frédéric FRANCE	3db34a723d	Update style.css.php	2016-04-18 00:55:12 +02:00
frederic34	60ebc6fa11	Some correction for testconnect	2016-04-18 00:47:08 +02:00
Frédéric FRANCE	09528cccaf	Update printsheet.php	2016-04-17 19:14:48 +02:00
aspangaro	19b594ee9d	Correct travis	2016-04-17 15:58:32 +02:00
aspangaro	b59c94e056	NEW: Accountancy - Add Result page ... & review	2016-04-17 15:44:04 +02:00
Marcos García de La Fuente	e2c86d3fd8	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
Marcos García de La Fuente	54dd1763fe	Little refactor	2016-04-17 15:05:54 +02:00
Frédéric FRANCE	d5980a5bf8	Update html.formmail.class.php	2016-04-17 12:20:45 +02:00
frederic34	75127638a4	Embed images	2016-04-17 10:28:21 +02:00
frederic34	8428b791f8	Add logger to dump smtp dialog	2016-04-16 22:25:47 +02:00
Marcos García de La Fuente	21ba24a0cd	NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions	2016-04-16 22:13:55 +02:00
Marcos García de La Fuente	84b58d27e6	NEW Renamed ActionComm::add function to ActionComm::create	2016-04-16 21:41:06 +02:00
Marcos García de La Fuente	863efcbc5d	NEW Removed unused FormOrder::selectSourcesCommande function ... Also refactored select functions to avoid using HTML and encourage using Form::selectarray function	2016-04-16 21:33:23 +02:00
Marcos García de La Fuente	3722fc1014	Refactored FormVentilation class	2016-04-16 20:16:38 +02:00
Marcos García de La Fuente	aa64266c2f	FIX #5008 SQL error when editing the reference of a supplier invoice that already exists ... Close #5008	2016-04-16 18:44:31 +02:00
frederic34	567dc1734e	Add Swift Mailer to send mails	2016-04-16 18:15:03 +02:00
appchecker	bc949cafd2	fix: comparing instead of assign	2016-04-16 13:39:55 +03:00
Juanjo Menent	a2b680aa5a	Merge remote-tracking branch 'upstream/develop' into develop	2016-04-15 18:08:12 +02:00
Juanjo Menent	b7d36da74f	Merge pull request #5006 from atm-maxime/new_banklink_withdraw ... New add link to widthdraw slip card on bank transaction	2016-04-15 18:07:33 +02:00
Juanjo Menent	ecbf5996c1	FIX #4961	2016-04-15 17:20:37 +02:00
Juanjo Menent	f86952dfaa	FIX Add missing field fk_shipping_method_id	2016-04-15 16:57:11 +02:00
Juanjo Menent	b5f7f962cc	FIX Travis fails	2016-04-15 16:05:47 +02:00
Juanjo Menent	9f4ccfab95	FIX #3815 With higher quality	2016-04-15 15:54:51 +02:00
Juanjo Menent	c5ecc46a22	FIX #3815 With higher quality	2016-04-15 15:42:58 +02:00
Juanjo Menent	bff1ec2d80	Merge remote-tracking branch 'upstream/3.9' into develop	2016-04-15 13:49:59 +02:00
Juanjo Menent	8751f6cfa0	Merge pull request #4998 from FHenry/3.9 ... FIX Hook resprint must be printed	2016-04-15 13:05:40 +02:00
Juanjo Menent	4446e6a36c	FIX #3815 Call to undefined function local_by_date(). branch 3.8	2016-04-15 12:47:21 +02:00
Christophe Battarel	ec5e0e5290	forgot one line	2016-04-15 12:32:36 +02:00
Christophe Battarel	c3d4cd85f1	NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier ... order even if no supplier price defined	2016-04-15 12:28:35 +02:00
Juanjo Menent	2d3b2c08b5	FIX #3815 Call to undefined function local_by_date(). branch 3.7	2016-04-15 10:56:03 +02:00
Christophe Battarel	1676595b93	NEW: fichinter lines ordered by rang AND DATE	2016-04-14 10:50:32 +02:00
Maxime Kohlhaas	9de6d31c87	New add link to widthdraw slip card on bank transaction	2016-04-13 15:57:46 +02:00
Laurent Destailleur	e1d35c2797	Fix waarnings	2016-04-12 19:29:32 +02:00
Laurent Destailleur	87702f89fc	Work on website module	2016-04-12 19:17:50 +02:00
Laurent Destailleur	df8bbaee34	Add icone for website module	2016-04-12 18:24:35 +02:00
fappels	2462716eb4	Fix migration script	2016-04-12 16:24:00 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
Laurent Destailleur	e61c83d708	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:03:19 +02:00
Laurent Destailleur	8342a61ea9	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/tpl/objectline_edit.tpl.php htdocs/fourn/class/fournisseur.product.class.php htdocs/fourn/facture/card.php htdocs/product/composition/card.php	2016-04-12 15:00:02 +02:00
Laurent Destailleur	fedcad31e0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/admin/multicurrency.php	2016-04-12 14:47:16 +02:00
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +02:00
Laurent Destailleur	7ce82aaf16	Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be ... implemented with pure CSS/Jquery so no more need of not maintained external library.	2016-04-12 13:38:41 +02:00
Laurent Destailleur	56c64f22be	Prepare menu icon to hide/show left menu	2016-04-12 13:30:47 +02:00
Florian HENRY	872c99afe9	FIX Hook resprint be printed	2016-04-12 11:35:39 +02:00
Maxime Kohlhaas	25dcca301f	Fix VAT amount on credit note was > 0 when manually entered	2016-04-12 09:47:35 +02:00
Christophe Battarel	0dd25a7e70	add new filter in GROUP BY clause	2016-04-12 09:39:48 +02:00
nka11	9ced1dc008	fixing some style and renaming Account to User API	2016-04-11 23:27:43 +02:00
nka11	e5a447c148	Adding more line features (PUT, DELETE, POST)	2016-04-11 22:41:35 +02:00
Laurent Destailleur	b71c6a8a54	Merge pull request #4800 from atm-ph/new_multicurrency_sync_rates ... New multicurrency sync rates	2016-04-11 19:20:59 +02:00
Laurent Destailleur	d0e3d9db76	Merge pull request #4992 from altatof/fix_minimum_buying_price ... FIX: correct display of minimum buying price	2016-04-11 19:17:09 +02:00
Laurent Destailleur	fabeb37b65	Merge pull request #4990 from FHenry/3.9 ... FIX #4989	2016-04-11 19:09:46 +02:00
Laurent Destailleur	3127432a4d	Merge pull request #4987 from marcosgdf/bug-4874 ... FIX #4874 SQL error when listing users	2016-04-11 19:08:56 +02:00
Laurent Destailleur	4d14f3e6f2	Merge pull request #4983 from marcosgdf/bug-4442 ... FIX #4442 Missing translation in Banks menu	2016-04-11 18:59:03 +02:00
Laurent Destailleur	46dd3c0cec	Merge pull request #4982 from marcosgdf/bug-4737 ... FIX #4737 Bank transacion type selector translation is cropped	2016-04-11 18:58:26 +02:00
Laurent Destailleur	b60e90a7b7	NEW A module can add, into its import profiles, a sql request to execute ... at end of import. This allow to update dernormalized data after import.	2016-04-11 18:08:03 +02:00
nka11	1fdcd0e859	Fixed bugs in order api. Added method for posting new lines in order	2016-04-11 18:07:02 +02:00
Christophe Battarel	292373cf84	forgot new discount field	2016-04-11 17:43:10 +02:00
Christophe Battarel	983b2c9a21	FIX: real min buying price	2016-04-11 17:40:47 +02:00
Christophe Battarel	791df0c9ea	FIX: correct display of minimum buying price	2016-04-11 17:27:34 +02:00
Laurent Destailleur	3678e05270	Mutualize code by moving getter into parent class.	2016-04-11 16:36:00 +02:00
Laurent Destailleur	03f43d7c55	Removed a TODO by moving detection of line of records of a file to ... import into the import driver.	2016-04-11 15:19:58 +02:00
Laurent Destailleur	0e7fb80a34	FIX: We should be able to import value '0'	2016-04-11 14:56:42 +02:00
Florian HENRY	8035742779	FIX fetchAllEMailTemplate	2016-04-11 14:52:22 +02:00
Laurent Destailleur	695cccca1c	Import wizard accept both id or ref into imported fields. But if the ref ... is numeric, there is no way to know if it is a ref or id. So i introduct support of syntax id: or ref: into value of field to import to force type.	2016-04-11 14:44:14 +02:00
Florian HENRY	23bb2eaf8a	remove debug	2016-04-11 14:27:17 +02:00
Florian HENRY	b7275edfb8	FIX #4989	2016-04-11 14:24:31 +02:00
Laurent Destailleur	9f019a0ec3	Debug supplier proposal module	2016-04-10 20:50:55 +02:00
nka11	11292410e9	Fix coding style errors	2016-04-10 14:23:29 +02:00
nka11	132cdd9ed4	Fix coding style errors	2016-04-10 14:15:38 +02:00
nka11	65e4273fdf	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev	2016-04-10 14:00:00 +02:00
nka11	cea87dccbb	crlf fix	2016-04-10 13:59:52 +02:00
nka11	d0356d6bd0	new api class for accounts, filtering on order api	2016-04-10 13:57:53 +02:00
Juanjo Menent	f25bf64257	Merge pull request #4978 from marcosgdf/bug-4851 ... FIX #4851 Project selector in supplier invoices shows the project label twice	2016-04-10 12:41:08 +02:00
Juanjo Menent	ddb1d06ad4	Merge pull request #4980 from marcosgdf/3.8 ... FIX #4743 UI glitch in project summary page	2016-04-10 11:56:37 +02:00
Juanjo Menent	e27def479f	Merge pull request #4986 from marcosgdf/bug-4747 ... FIX #4747 Missing UI background when registering a supplier invoice payment	2016-04-10 11:54:27 +02:00
Juanjo Menent	be0b7c86ff	Merge pull request #4985 from marcosgdf/bug-4742 ... FIX #4742 Able to delete a supplier invoice with a registered payment	2016-04-10 11:52:21 +02:00
Juanjo Menent	c3472f7879	Merge pull request #4984 from marcosgdf/bug-4424 ... FIX #4424 Missing email of user popup in supplier orders area	2016-04-10 11:51:36 +02:00
Juanjo Menent	4f5d96150a	Merge pull request #4977 from marcosgdf/bug-4766 ... FIX #4766 VAT not shown in supplier invoice popup	2016-04-10 11:42:29 +02:00
Marcos García de La Fuente	7acbf1dd92	FIX #4874 SQL error when listing users ... Close #4874	2016-04-10 01:00:27 +02:00
Marcos García de La Fuente	15d9273751	FIX #4747 Missing UI background when registering a supplier invoice payment ... Close #4747	2016-04-10 00:30:31 +02:00
Marcos García de La Fuente	af473df214	FIX #4742 Able to delete a supplier invoice with a registered payment ... Close #4742	2016-04-09 23:29:19 +02:00
Marcos García de La Fuente	a41a80b8fe	Merge branch 'develop' into oop-refactor-bankaccount-tostring	2016-04-09 23:17:09 +02:00
Marcos García de La Fuente	865f9defff	FIX #4424 Missing email of user popup in supplier orders area ... Close #4424	2016-04-09 23:08:47 +02:00
Marcos García de La Fuente	b9de3d5852	FIX #4442 Missing translation in Banks menu ... Close #4442	2016-04-09 23:03:00 +02:00
Marcos García de La Fuente	3135cf720d	FIX #4737 Bank transacion type selector translation is cropped ... Close #4737	2016-04-09 22:59:12 +02:00
Marcos García de La Fuente	7cc1288bb2	FIX #4743 UI glitch in project summary page ... Close #4743	2016-04-09 22:54:34 +02:00
Marcos García de La Fuente	1026484da1	FIX #4748 Supplier invoice payment confirmation amount is not translated ... Close #4748	2016-04-09 22:48:42 +02:00
Marcos García de La Fuente	b2f922291f	FIX #4851 Project selector in supplier invoices shows the project label twice ... Close #4851	2016-04-09 22:38:58 +02:00
Marcos García de La Fuente	9169adf4ce	FIX #4766 VAT not shown in supplier invoice popup ... Close #4766	2016-04-09 22:34:55 +02:00
phf	a33472942d	Fix synchronize rates for multicurrency module	2016-04-09 22:12:33 +02:00
nka11	5967330004	merge api_customer to api_ thirdparty	2016-04-09 21:39:12 +02:00
Laurent Destailleur	63dd6d98ec	Remove warnings	2016-04-09 19:53:16 +02:00
Laurent Destailleur	af4a975be2	Fix PHPCS	2016-04-09 19:50:13 +02:00
Laurent Destailleur	acf546d982	Move a not used function into a better place.	2016-04-09 19:42:34 +02:00
Laurent Destailleur	d395e8b85e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-09 19:36:48 +02:00
Scrutinizer Auto-Fixer	051ccf30a1	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 17:32:05 +00:00
Laurent Destailleur	dd1f946afe	Clean dead code	2016-04-09 19:06:40 +02:00
Laurent Destailleur	f8b39ab50e	Fix errors reported by scrutinizer	2016-04-09 19:04:23 +02:00
Laurent Destailleur	1b6fa8ec34	Clean dead code	2016-04-09 19:04:04 +02:00
Laurent Destailleur	b16d9a88d5	Fix regression after renaming vars	2016-04-09 19:03:34 +02:00
Laurent Destailleur	27217ccccd	Maxi debug of supplier order workflow. ... Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED Parameter user is added so it is defined into triggers.	2016-04-09 18:51:09 +02:00
Laurent Destailleur	c2fc9ecf68	Fix scrutinizer warning	2016-04-09 16:12:53 +02:00
Laurent Destailleur	507b9a2956	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-04-09 16:00:52 +02:00
Laurent Destailleur	935327d911	Fix scrutinizer warning	2016-04-09 16:00:24 +02:00
Frédéric FRANCE	f90cffd74a	Update nusoap.php ... re-establish user-agent	2016-04-09 15:42:53 +02:00
Laurent Destailleur	83644dcb93	Fix errors reported by scrutinizer	2016-04-09 15:38:15 +02:00
Laurent Destailleur	f2f672a801	FIX variable outpulang not defined	2016-04-09 15:14:27 +02:00
Laurent Destailleur	475c11ca8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-09 15:08:29 +02:00
Laurent Destailleur	724610ba5b	Quality fixes reported by scrutinizer	2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer	c2243909e9	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 13:07:33 +00:00
Laurent Destailleur	5b55af4d66	NEW Mutualize code: Use one call of function "addThumbs", when possible, ... to generate thumbs files instead of several call of "vignette" function.	2016-04-09 14:12:21 +02:00
Laurent Destailleur	e869ed51e4	Use the update method to edit cost price of a product instead of ... setValue that does not run triggers.	2016-04-09 10:41:39 +02:00
Laurent Destailleur	cd13c942ed	FIX When editing a numeric that is not defined, we must not show 0 but ... an empty field.	2016-04-09 10:40:56 +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	3827a06796	Debug the supplier ref reputation feature.	2016-04-08 22:18:36 +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	22bfa7a9e2	Add logs	2016-04-08 21:50:48 +02:00
Laurent Destailleur	184705fb14	Debug web service project	2016-04-08 21:50:31 +02:00
Laurent Destailleur	60682f075c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-08 21:46:17 +02:00
Laurent Destailleur	23c3186932	Merge pull request #4967 from IonAgorria/ws-project ... New: Project WebServices	2016-04-08 21:45:56 +02:00
Laurent Destailleur	f205b04b39	Merge pull request #4960 from defrance/patch-119 ... change comment	2016-04-08 21:32:55 +02:00
Laurent Destailleur	234f3e331d	Merge pull request #4962 from FHenry/3.8 ... FIX : Template email must take care of position column	2016-04-08 21:32:27 +02:00
Laurent Destailleur	2ffe06b1b3	Merge pull request #4965 from GPCsolutions/3.9-sentry ... Prevent sentry logging error with 3.9 update	2016-04-08 21:31:32 +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	01e538fa78	Merge pull request #4942 from aspangaro/4.0-p16 ... NEW: Move HRM area page in HRM directory	2016-04-08 20:51:17 +02:00
Laurent Destailleur	92f1092f5c	Fix remove warnings	2016-04-08 19:46:56 +02:00
Laurent Destailleur	daa1aed363	Bad placeholder	2016-04-08 19:31:18 +02:00
Laurent Destailleur	80caf58866	FIX Default vat is not set correctly when an error occured and we use ... VAT identified by a code.	2016-04-08 19:19:13 +02:00
Laurent Destailleur	cfcbc34972	FIX Default vat is not set correctly when an error occured and we use ... VAT identified by a code.	2016-04-08 19:16:40 +02:00
Laurent Destailleur	b9ffc18c27	Uniformize log of supplier order. Now use the generic log feature.	2016-04-08 17:28:48 +02:00
Laurent Destailleur	f14b03a230	NEW Add more trackable events (create, submit and receive supplier ... order). So we will be able to use generic features to log what was done with the specific table llx_commande_fournisseur_log	2016-04-08 17:07:25 +02:00
Laurent Destailleur	5753f21745	Missing translations	2016-04-08 16:09:35 +02:00
Laurent Destailleur	eb7bba9568	Fix translation	2016-04-08 16:07:30 +02:00
Laurent Destailleur	04a85ff831	FIX Substitution key on email of supplier order was broken	2016-04-08 16:06:50 +02:00
Laurent Destailleur	66ec4cdcf6	Update pdfmake.js	2016-04-08 15:53:13 +02:00
Laurent Destailleur	a74fc347bb	Fix translation	2016-04-08 15:41:01 +02:00
Laurent Destailleur	443c5a490a	Update ckeditor to 4.5.8	2016-04-08 15:36:24 +02:00
Laurent Destailleur	9d836571d5	Update PHPExcel	2016-04-08 15:32:13 +02:00
Laurent Destailleur	2f42a226d0	Update escpos-php	2016-04-08 15:30:43 +02:00
Laurent Destailleur	1b04eabf1f	Merge log with events tabs	2016-04-08 14:28:49 +02:00
Laurent Destailleur	cefc373a5f	Missing translations	2016-04-08 11:42:02 +02:00
Laurent Destailleur	104e34fe22	Fix css and missing link "go to list"	2016-04-08 03:40:23 +02:00
Laurent Destailleur	7a48ceb635	Uniformize code for mass actions	2016-04-08 02:53:10 +02:00
Laurent Destailleur	8222624ff0	NEW Can select fields to show on list also for list of customer orders, ... shipments and invoices.	2016-04-08 02:39:57 +02:00
Laurent Destailleur	24c91933d0	Work on select fields for orders, invoices and shipments	2016-04-08 01:00:02 +02:00
Ion Agorria	a5c5f9b10e	New: Project WebServices	2016-04-07 22:08:50 +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
Laurent Destailleur	d7f669b918	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-07 19:28:18 +02:00
Laurent Destailleur	39b61d6924	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/boxes/box_task.php htdocs/core/lib/files.lib.php	2016-04-07 19:27:53 +02:00
Laurent Destailleur	4092f5fa2f	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-04-07 19:24:49 +02:00
Laurent Destailleur	f7fb95cab8	FIX Box disabled because bugged	2016-04-07 19:24:29 +02:00
Raphaël Doursenaud	9d6efde935	Prevent sentry logging error with 3.9 update ... Since we don't ship the required libraries anymore, if the module had been enabled before upgrade, the code was failing making Dolibarr totally unusable. Mitigated the issue by disabling sentry logging if the required libraries are unavailable.	2016-04-07 17:16:42 +02:00
Christophe Battarel	d052eac6fc	NEW: add product type filter on turnover report	2016-04-07 14:57:41 +02:00
Laurent Destailleur	086345490d	Generalize the set of trackid for everyemail sent by dolibarr.	2016-04-07 14:29:07 +02:00
Laurent Destailleur	1e6152eb53	FIX Missing a row when incoterm is on	2016-04-07 14:17:20 +02:00
Florian HENRY	f62a45ddfc	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-04-07 14:16:38 +02:00
Florian HENRY	1f723cb8d0	FIX : Template email must take care of positino column	2016-04-07 14:16:10 +02:00
Laurent Destailleur	7f129d14d7	Better responsive design	2016-04-07 14:08:38 +02:00
Laurent Destailleur	059466030a	FIX Missing a new line into log of sent emails	2016-04-07 12:42:18 +02:00
Laurent Destailleur	2c829e7cb6	NEW Add picto on module list to show warning and if module is an ... external module.	2016-04-07 11:50:45 +02:00
Laurent Destailleur	ee53a8b1a8	NEW Can filter modules on publisher	2016-04-06 16:45:22 +02:00
Laurent Destailleur	1a1dc39a6b	Mark a duplicate function as deprecated	2016-04-06 14:53:14 +02:00
Laurent Destailleur	4e3985fbc5	NEW If option to see non stable modules is on, add a filter into module ... list to filter on level (deprecated, experimental, development)	2016-04-06 13:27:46 +02:00
BENKE Charlie	9484dc5b3e	change comment	2016-04-06 11:38:34 +02:00
Laurent Destailleur	a43a0a3f4c	Debug module loan and disable non working features	2016-04-06 11:21:55 +02:00
nka11	0978ebc731	Improve categories API to retreive categories of a given Item	2016-04-06 10:25:40 +02:00
Alexis Algoud	a2c5bfa72c	FIX parse error	2016-04-06 10:20:38 +02:00
nka11	f3ae67a434	added customer API	2016-04-06 10:19:25 +02:00
Alexis Algoud	11bb4d1cfb	Show in select	2016-04-06 10:17:13 +02:00
Alexis Algoud	c2a5ad7d9c	FIX sql	2016-04-06 10:05:03 +02:00
Alexis Algoud	61a077b0ee	NEW reputation for price supplier	2016-04-06 09:58:03 +02:00
Juanjo Menent	b59b758016	Merge pull request #4943 from atm-gauthier/NEW_multientity_for_project ... NEW : project sharing in select_projetcs_list function	2016-04-05 17:48:23 +02:00
Juanjo Menent	8bdda85801	Merge pull request #4955 from fmarcet/3.9 ... FIX: Not removing code into vatrate.	2016-04-05 17:43:48 +02:00
Laurent Destailleur	f9d7c27bd2	FIX Export must use a left join to not loose lines	2016-04-05 17:17:40 +02:00
Laurent Destailleur	dd87195a07	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-04-05 17:11:54 +02:00
Laurent Destailleur	ed0ab05b93	FIX Damn, where was the project ref ?	2016-04-05 17:11:44 +02:00
fmarcet	d3794bb145	FIX: Not removing code into vatrate.	2016-04-05 16:49:50 +02:00
Juanjo Menent	10df0e33d4	Merge pull request #4896 from grandoc/3.9 ... fix a lot of beug	2016-04-05 16:49:22 +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
Laurent Destailleur	a0a31a3c94	Better responsive design for dictionnaries	2016-04-05 11:24:58 +02:00
Laurent Destailleur	2d102d3132	Bad translation key	2016-04-05 10:24:28 +02:00
Laurent Destailleur	a656e42d42	Missing translation	2016-04-05 10:16:07 +02:00
Laurent Destailleur	6c87dfafae	FIX Bad translation key	2016-04-05 10:12:03 +02:00
frederic34	e53501f89d	add lang	2016-04-04 18:37:04 +02:00
frederic34	198b9ce8fe	Select Preferred Sending Method for a customer	2016-04-04 18:28:55 +02:00
Florian HENRY	b7a0ab784b	travis	2016-04-04 16:59:17 +02:00
Florian HENRY	c0c37c4992	travis	2016-04-04 16:36:39 +02:00
Laurent Destailleur	43165bab02	FIX Filter/search on extrafields on lists ... Conflicts: dev/skeletons/skeleton_list.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-04 16:22:26 +02:00
Laurent Destailleur	76ad7f36b9	FIX Filter/search on extrafields on lists	2016-04-04 16:03:35 +02:00
Laurent Destailleur	592a041bc5	FIX Filter/search on extrafields on lists	2016-04-04 16:02:29 +02:00
Florian HENRY	86c34a313e	travis	2016-04-04 15:28:25 +02:00
Laurent Destailleur	5101c96223	Restore button to create object from the project view.	2016-04-04 15:25:08 +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	1d700cd286	Keep empty if field value has no value.	2016-04-04 13:26:48 +02:00
Laurent Destailleur	122cd200ec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-04 13:24:36 +02:00
gauthier	e043aebfa1	NEW : project sharing in select_projetcs_list function	2016-04-04 11:05:12 +02:00
Laurent Destailleur	71ef9bc90f	Merge pull request #4940 from IonAgorria/fix-facrec ... Fix #4227: Change FactureRec superclass to CommonInvoice	2016-04-04 09:24:55 +02:00
aspangaro	a85575a93c	Merge remote-tracking branch 'Upstream/develop' into 4.0-p16	2016-04-04 05:31:12 +02:00
aspangaro	c6aabd3f34	NEW: Move HRM area page in HRM directory	2016-04-04 05:29:12 +02:00
Laurent Destailleur	21475b587d	Merge pull request #4939 from marcosgdf/patch-2 ... Corrected PHP documentation of calcul_price_total function	2016-04-04 00:43:14 +02:00
Laurent Destailleur	30f27b6fac	Merge pull request #4933 from frederic34/patch-10 ... FIX correctly retreive ref_customer	2016-04-04 00:36:49 +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
Laurent Destailleur	29fc94e416	Merge pull request #4923 from frederic34/patch-7 ... FIX Remove sql error when creating table llx_establishment.sql	2016-04-04 00:31:20 +02:00
Laurent Destailleur	f8fa2202ed	Merge pull request #4921 from FHenry/3.9 ... Add hook parameters on New search Box	2016-04-04 00:25:56 +02:00
Laurent Destailleur	f36f33f71b	Merge pull request #4915 from defrance/patch-117 ... Add contact hook on specific task contact page	2016-04-04 00:21:57 +02:00
Laurent Destailleur	6a4ca98ad9	Merge pull request #4908 from altatof/fix_bad_rounding ... FIX: systematic rounding causes prices to be updated without reason	2016-04-04 00:18:18 +02:00
Laurent Destailleur	cab1c0f5cd	Merge pull request #4886 from apachler/develop ... Added functionality to get project customer contact as contact_xx tags	2016-04-04 00:11:19 +02:00
Marcos García	fded7d3e9a	Corrected PHP documentation of calcul_price_total function	2016-04-03 22:17:25 +02:00
Laurent Destailleur	89bc29ed45	Try to remove grey background when using jquery jmobile.	2016-04-03 21:08:03 +02:00
Ion Agorria	fbe0414a1f	Change FactureRec superclass CommonInvoice	2016-04-03 21:02:19 +02:00
Laurent Destailleur	4ced5ed27f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-03 20:02:28 +02:00
Laurent Destailleur	cea48a8dd6	FIX bad translation language loaded ... FIX When changing thirdparty on event card, the showempty option of contact was lost. FIX Bad placeholder shown on combo to select a thirdparty.	2016-04-03 20:02:02 +02:00
Juanjo Menent	2388887e99	Merge pull request #4938 from aspangaro/4.0-p15 ... FIX: Accountancy - Update balance to add description of the accounting account + bugfix	2016-04-03 17:38:02 +02:00
aspangaro	e79c6c1439	Correct travis error	2016-04-03 17:09:22 +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	deeb6f604d	Merge pull request #4905 from altatof/fix_margin_display ... FIX: dont retrieve new buying price on margin display	2016-04-03 16:17:41 +02:00
Juanjo Menent	ba1c029723	Merge pull request #4904 from aspangaro/4.0-p10 ... FIX: Accountancy Add informations to show in journal & correct problems to export in bookkee…	2016-04-03 16:16:30 +02:00
Juanjo Menent	75eb718c01	Merge pull request #4922 from atm-alexis/NEW_multientity_for_project ... FIX multicompany project access	2016-04-03 16:13:24 +02:00
Juanjo Menent	314069f1da	Qual: Remove unused function	2016-04-03 15:47:07 +02:00
aspangaro	f8bc456807	FIX: Accountancy - Update balance to add description of the accounting account + bugfix	2016-04-03 15:32:46 +02:00
Laurent Destailleur	0e6ee0d744	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-03 12:47:02 +02:00
Laurent Destailleur	3aeb579486	Fix bad link	2016-04-03 12:46:34 +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	305bbf1450	Fix Doc	2016-04-03 12:39:39 +02:00
Juanjo Menent	8cd1b95842	Merge pull request #4935 from aspangaro/4.0-p13 ... FIX: Accountancy - Correct the display of account_parent in chart of accounts	2016-04-03 12:36:03 +02:00
Juanjo Menent	e8b2d6baab	NEW #3510 : Working	2016-04-03 12:22:18 +02:00
Juanjo Menent	9d189b3c04	NEW #3510 : Working	2016-04-03 12:14:51 +02:00
Juanjo Menent	d55d12baeb	NEW #3510 : Working	2016-04-03 11:56:31 +02:00
Florian HENRY	0ab40f11be	Merge branch 'develop' into develop_advtargetemailiing	2016-04-03 11:29:17 +02:00
aspangaro	c48869e02b	Bugfix	2016-04-03 10:51:56 +02:00
aspangaro	9cc7b53071	Merge remote-tracking branch 'Upstream/develop' into 4.0-p13	2016-04-03 10:50:33 +02:00
aspangaro	33e8833287	Fix travis	2016-04-03 10:47:21 +02:00
Laurent Destailleur	6096c8c49a	Minor fix in CSS	2016-04-02 16:53:55 +02:00
Laurent Destailleur	e954fc07b3	Use natural_search for sql search forging	2016-04-02 16:30:17 +02:00
Laurent Destailleur	127ceeac8c	Uniformize code for list of audit events	2016-04-02 16:12:48 +02:00
Laurent Destailleur	10f639507f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 15:54:51 +02:00
Laurent Destailleur	066c793de2	FIX image extension must be in lower case ... Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 15:46:01 +02:00
Laurent Destailleur	c12541f4f2	FIX image extension must be in lower case	2016-04-02 15:00:58 +02:00
Laurent Destailleur	c0b2d7405a	FIX Generated thumbs must always use the png format so using thumbs can ... work.	2016-04-02 14:46:04 +02:00
Laurent Destailleur	599b225489	FIX Creation of thumb image for size "small" was not done. ... Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 14:21:50 +02:00
Laurent Destailleur	be8384389f	FIX Creation of thumb image for size "small" was not done. ... Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 14:20:21 +02:00
Laurent Destailleur	e1bec46a34	FIX The include file for action on files should not be a template file ... but an action include file.	2016-04-02 14:16:16 +02:00
Laurent Destailleur	66f9f0d046	FIX Creation of thumb image for size "small" was not done.	2016-04-02 14:15:38 +02:00
aspangaro	0c5f504881	FIX: Accountancy - Correct the display of account_parent	2016-04-02 06:22:31 +02:00
Laurent Destailleur	281b06a2d3	NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and ... MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.	2016-04-01 18:44:23 +02:00
Frédéric FRANCE	d4529d19c7	Update facture.php ... ref_client in order ref_customer in shipping	2016-04-01 17:32:58 +02:00
Florian HENRY	038b928ea4	fix travis	2016-04-01 17:09:03 +02:00
Laurent Destailleur	7edd1d89a0	Fix missing td	2016-04-01 16:59:17 +02:00
Laurent Destailleur	d14f3d7e2b	FIX When deleting last shipment, status "shipment in progress" of order ... must move back to status "validated".	2016-04-01 16:59:08 +02:00
Laurent Destailleur	e40b678d7b	Uniformize code	2016-04-01 16:29:47 +02:00
Laurent Destailleur	97b5026ad8	Uniformize code and css	2016-04-01 16:18:45 +02:00
Florian HENRY	ae51321040	Debug Advance target emailing	2016-04-01 14:30:02 +02:00
Florian HENRY	867dbc766e	Merge branch 'develop' into develop_advtargetemailiing	2016-04-01 14:03:43 +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
Laurent Destailleur	9c394b58b5	Move help text at better place.	2016-04-01 12:40:34 +02:00
Laurent Destailleur	be483bd787	FIX Some records were lost into margin per product report	2016-04-01 12:28:15 +02:00
Laurent Destailleur	8a1358d539	FIX Some records were lost into margin per product report	2016-04-01 12:27:49 +02:00
Laurent Destailleur	27ed9ba3da	Remove now link useless here	2016-04-01 12:13:43 +02:00
Laurent Destailleur	feb35adbe1	FIX Missing clean of criteria	2016-04-01 12:04:07 +02:00
Laurent Destailleur	063905ea03	Save space again (another line won)	2016-04-01 11:43:11 +02:00
Laurent Destailleur	9eb1925825	FIX No need to ask doc template when only one is defined	2016-04-01 11:12:49 +02:00
Laurent Destailleur	c340745b78	FIX Option "showstock" was not effective into warehouse list	2016-04-01 11:05:15 +02:00
Laurent Destailleur	0981039573	FIX If stock module not enabled, it was not possible to make shipments	2016-04-01 10:57:18 +02:00
Florian HENRY	304aab957b	Start implement advance arget emalaing	2016-04-01 10:52:19 +02:00
aspangaro	1df1e775ee	Space2	2016-04-01 06:49:24 +02:00
aspangaro	e118aad95f	Space	2016-04-01 06:48:17 +02:00
aspangaro	620e03337a	Merging problem	2016-04-01 06:45:46 +02:00
aspangaro	84d326e036	FIX: Problem with dolibarr installation/migration script. Range is a reserved name.	2016-04-01 06:41:49 +02:00
Laurent Destailleur	2a19326a3f	FIX Missing database escaping on supplier price insert/update	2016-03-31 21:47:32 +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	fea9c65906	FIX Missing clean of criteria	2016-03-31 15:22:43 +02:00
root	b018500fd4	FIX multicompany project access	2016-03-31 14:44:18 +02:00
Florian HENRY	f567a2a0ce	Search box hook	2016-03-31 12:50:40 +02:00
Laurent Destailleur	9459a36c12	Minor look enhancement	2016-03-31 12:28:45 +02:00
Florian HENRY	5d4c959d2e	Add hook parameters on New search Box	2016-03-31 12:18:26 +02:00
Laurent Destailleur	54f3005666	NEW Can select fields to show on proposal lists.	2016-03-31 11:58:05 +02:00
Laurent Destailleur	27cf494009	Fix bad translation	2016-03-30 23:35:43 +02:00
BENKE Charlie	98ef179307	Add contact hook ... I use the same hook name as contactpl	2016-03-30 21:09:27 +02:00
Laurent Destailleur	2d9c53fc26	NEW Merge all boxes "related objects" into one. This save a lot of room ... on most card and avoid often horizontal scoll.	2016-03-30 19:18:31 +02:00
Laurent Destailleur	a47accb1c3	FIX PMP is deprecated at warehouse level	2016-03-30 18:08:08 +02:00
Laurent Destailleur	a36abd43fd	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-30 16:27:14 +02:00
Laurent Destailleur	7146a8319b	FIX Each time we edit a line, we loose the unit price.	2016-03-30 16:26:34 +02:00
Laurent Destailleur	b367c9daac	Enhance picto for setup	2016-03-30 16:07:48 +02:00
Laurent Destailleur	0c3635cf8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-30 15:25:27 +02:00
Laurent Destailleur	e908b983d4	NEW Can search on shipments into the quick search box	2016-03-30 15:25:16 +02:00
Laurent Destailleur	fa10f9e030	FIX #4880	2016-03-30 14:07:07 +02:00
Laurent Destailleur	07e622a7f8	Introduce () to have code cleaner	2016-03-30 14:04:22 +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
Laurent Destailleur	c730312a9f	Merge pull request #4903 from aspangaro/4.0-p9 ... NEW: Accountancy - Add category	2016-03-30 13:58:37 +02:00
Marcos García de La Fuente	362bc106eb	FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes	2016-03-30 11:40:57 +02:00
Laurent Destailleur	334cdbc2f5	NEW Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list	2016-03-30 11:13:29 +02:00
Laurent Destailleur	e79633fa8d	Fix search on supplier orders	2016-03-30 11:03:39 +02:00
Laurent Destailleur	abcbc5c0da	Fix limit management	2016-03-30 10:45:14 +02:00
Andreas Pachler	7eded39e28	Reworked functionality to get project contact as contact_xx tags	2016-03-30 08:34:32 +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	ef03dc3454	Youps !	2016-03-30 06:49:10 +02:00
aspangaro	26e017f4ef	Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 ... Conflicts: htdocs/accountancy/admin/card.php	2016-03-30 06:05:38 +02:00
aspangaro	f6f7dc8e86	Try to correct travis II	2016-03-30 05:41:44 +02:00
Laurent Destailleur	0d9a86db3f	Minor lool enhancement	2016-03-30 00:06:55 +02:00
Laurent Destailleur	ff96ebf381	Enahnce navigation	2016-03-29 22:09:13 +02:00
aspangaro	29c4971d5a	Try to correct travis	2016-03-29 21:14:19 +02:00
Laurent Destailleur	32080e99dd	Fix dolistore url	2016-03-29 21:14:12 +02:00
Laurent Destailleur	b51bd74934	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-29 21:09:26 +02:00
Laurent Destailleur	83dd3081d5	FIX #4880. Lang should not be requied to fetch a user	2016-03-29 21:07:53 +02:00
aspangaro	e43043edcb	Merge remote-tracking branch 'Upstream/develop' into 4.0-p10	2016-03-29 21:02:46 +02:00
Laurent Destailleur	61c0ee3c6c	Merge pull request #4900 from aspangaro/4.0-p8 ... NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts	2016-03-29 20:32:34 +02:00
Laurent Destailleur	12c8ed6cf0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-29 20:21:19 +02:00
Laurent Destailleur	2e5cc98e59	Fix into badges visibility	2016-03-29 20:06:01 +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
Laurent Destailleur	2e5b61dac7	Merge pull request #4909 from dzroot/patch-1 ... Update llx_20_c_departements.sql	2016-03-29 19:44:40 +02:00
Laurent Destailleur	3142fd3d84	Merge pull request #4899 from aspangaro/4.0-p7 ... Correct problem of merging with my last commits	2016-03-29 19:41:50 +02:00
Laurent Destailleur	718e9a7226	Filter on module origin	2016-03-29 19:18:53 +02:00
Laurent Destailleur	f4bea56a91	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-29 19:18:31 +02:00