3512 Commits

Author	SHA1	Message	Date
Florian HENRY	96a95d6ae1	Debug accountancy on 3.9	2015-12-09 12:55:08 +01:00
Laurent Destailleur	374480043e	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
Laurent Destailleur	ff4f1e7a5b	Debug 3.9	2015-12-05 19:20:39 +01:00
Laurent Destailleur	4a2bda3491	Look enhancement	2015-12-04 23:25:34 +01:00
Laurent Destailleur	5cd43d2df0	Some debug on new features	2015-12-04 20:51:34 +01:00
Laurent Destailleur	eb795a7a9d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-04 18:39:39 +01:00
Laurent Destailleur	8c03e46a83	Removed a TODO	2015-12-04 18:33:57 +01:00
Laurent Destailleur	6542da404e	Merge pull request #4129 from aspangaro/develop-bank ... New HRM Add bank tab in user to pay salary or expense report	2015-12-04 18:23:47 +01:00
Laurent Destailleur	bcadc33e31	Debug visibility on task/projects	2015-12-04 15:37:28 +01:00
aspangaro	6598ac6745	Add rights to see tab (hrm->employee->read)	2015-12-04 12:48:36 +01:00
aspangaro	c30728326e	Merge remote-tracking branch 'Upstream/develop' into develop-bank	2015-12-04 12:41:51 +01:00
Laurent Destailleur	e6ebc9c293	More complete tooltip help	2015-12-04 12:24:36 +01:00
Laurent Destailleur	4dd1cb3e77	Theme MD looks ready for 3.9 now.	2015-12-04 12:12:12 +01:00
Laurent Destailleur	12702ee128	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/report.lib.php htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:59:13 +01:00
Laurent Destailleur	7105fabb79	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/langs/en_US/users.lang htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:51:49 +01:00
Laurent Destailleur	63879c1ca6	Merge pull request #4122 from mrsof/patch-7 ... FIX: Cannot set property '_renderItem of undefined	2015-12-03 11:52:30 +01:00
aspangaro	882b66c586	HRM - Add bank tab in user to pay salary or expense report	2015-12-01 06:56:26 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Sof	292d3ba959	FIX: Cannot set property '_renderItem of undefined ... http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html	2015-11-30 20:28:36 +01:00
Laurent Destailleur	7b6d8dd23e	Fix for smartphone	2015-11-29 01:13:23 +01:00
Laurent Destailleur	5d5cfd498a	Add holiday date functions into PHPUnit	2015-11-28 19:54:16 +01:00
Laurent Destailleur	fcdb3af708	Merge pull request #4106 from aspangaro/develop-skype ... New: Better integration of skype for dolibarr 3.9	2015-11-28 16:31:35 +01:00
Laurent Destailleur	5b22eee938	FIX #4099	2015-11-28 16:11:15 +01:00
aspangaro	d12e3ca91f	Finish work on better integration of skype	2015-11-28 14:43:16 +01:00
aspangaro	9a2259c681	Correct button 'Export' and 'Write bookkeeping' on finance journal	2015-11-26 06:19:24 +01:00
Raphaël Doursenaud	973e42d10f	FIX #4097 Public holiday calculation ... The last day was ommitted and never parsed. If this day was a saturday, sunday or public holiday day, it was not computed.	2015-11-25 19:34:11 +01:00
Laurent Destailleur	cb3765bc92	Debug module Resource	2015-11-22 12:23:10 +01:00
Laurent Destailleur	c7447b0899	Add thirdparty of project into project summary of project home page. ... Total use a different color	2015-11-21 20:25:28 +01:00
Laurent Destailleur	6f7a3f2c66	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-21 20:00:50 +01:00
Laurent Destailleur	e3c6e4ebe5	NEW Add planned workload and declared progress on project summary list ... on project home page (data aggregated from tasks of project)	2015-11-21 20:00:38 +01:00
philippe grand	55bab28b9c	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-11-21 17:15:56 +01:00
Laurent Destailleur	c15c0f6fbb	Minor css fix	2015-11-21 15:31:27 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
philippe grand	928c44b04f	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-11-21 04:52:19 +01:00
Laurent Destailleur	60724df496	Merge pull request #4038 from atm-maxime/develop ... NEW add info page on product card	2015-11-21 01:51:32 +01:00
Laurent Destailleur	552ecbcd95	Merge pull request #3964 from aspangaro/develop-hrm3 ... HRM : Work in progress	2015-11-21 00:14:41 +01:00
Drosis Nikos	ee4eb13fff	Update functions2.lib.php	2015-11-20 19:05:00 +02:00
Maxime Kohlhaas	9c1545bc1b	NEW add info page on product card	2015-11-19 14:45:05 +01:00
philippe grand	4f280f63d0	[Qual] Uniformize code	2015-11-19 13:59:58 +01:00
aspangaro	b7b25c9682	Remove some code	2015-11-17 21:04:11 +01:00
aspangaro	a5ca6cb732	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-17 20:34:37 +01:00
Nikos Drosis	5082b1cc66	Fix for utf-8 characters in the mask mercure	2015-11-17 20:22:27 +02:00
BENKE Charlie	ce367bfa31	bad limittoshow usage ... the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector	2015-11-17 14:42:34 +01:00
Laurent Destailleur	6dc6bab556	Support of 'small', 'mini' and '' image size everywhere.	2015-11-17 10:38:00 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to ... do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to ... suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	b75923871c	FIX: Too many information were hidden. A lot of users still need bank ... account on PDF.	2015-11-14 14:56:44 +01:00
Laurent Destailleur	5e67eefff3	Removed phpcs warning	2015-11-13 12:48:17 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00