Commit Graph

6072 Commits

Author SHA1 Message Date
Laurent Destailleur
a0406bc741 Standardize view of events for products 2017-11-26 20:24:20 +01:00
Laurent Destailleur
ae906270f3 Debug module variant 2017-11-26 18:43:43 +01:00
Laurent Destailleur
1ec6c13ece Debug module variant 2017-11-26 10:13:32 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
dbcb38dd3b Use short label on table 2017-11-25 15:13:39 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
8659d97e97 Fix export of lot must use properties of lot from product_lot 2017-11-24 17:44:19 +01:00
Laurent Destailleur
295b4483d4 Enhance the repair.php tool 2017-11-23 13:23:16 +01:00
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
fd5cb736ce Merge pull request #6961 from atm-ph/new_event_with_multi_contact
New multi contacts on actioncomm
2017-11-22 12:05:04 +01:00
Laurent Destailleur
a630e665d9 Work on modulebuilder 2017-11-21 11:50:57 +01:00
Laurent Destailleur
e19ca7b6d4 Work on generic filemanager 2017-11-20 18:19:41 +01:00
Laurent Destailleur
5849efd9fc Work on public sharing files 2017-11-19 20:44:57 +01:00
Laurent Destailleur
e4b91ceb38 Add ar_EG 2017-11-19 20:33:06 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
cf0d67d71c Generation of pdf become default value 2017-11-17 23:57:32 +01:00
Laurent Destailleur
ba372bfc5c Fix typo 2017-11-16 23:11:49 +01:00
Laurent Destailleur
e06087888b NEW Show line "other filtered task" when using filter on timesheet. 2017-11-16 22:55:04 +01:00
Laurent Destailleur
0d192df1fd Standardize interface 2017-11-16 18:33:56 +01:00
Laurent Destailleur
5c3d8acfbb Work on website 2017-11-15 19:47:07 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
f789714f14 Fix translation 2017-11-14 18:16:01 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Laurent Destailleur
31e152274c NEW Add 2 new automatic classification in workflow module 2017-11-14 01:00:57 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
2668b80599 Standardize code 2017-11-12 14:21:34 +01:00
Laurent Destailleur
b5d63de708 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-11 17:49:51 +01:00
Laurent Destailleur
7e1e710d28 Merge pull request #7796 from IonAgorria/fix-price-dynamic
Fix: price dynamic bugs
2017-11-11 17:49:00 +01:00
Laurent Destailleur
cba3a3846f Merge pull request #7790 from frederic34/facrecmodelpdf
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Laurent Destailleur
75e5d80eb6 Better help on mass invoicing from orders 2017-11-11 17:09:15 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
b8cbb84e7c Clean code 2017-11-11 00:28:00 +01:00
Frédéric FRANCE
6f647f8a40 generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Ion Agorria
aa0b811f73 Undefined variable detection in price parser 2017-11-09 17:12:55 +01:00
Laurent Destailleur
40cb301915 Merge pull request #7773 from frederic34/accountingexport
NEW Can setup csv accounting export from admin config
2017-11-06 19:06:06 +01:00
Laurent Destailleur
45fc5701ae NEW Add a profile to import product translations 2017-11-06 12:59:58 +01:00
Laurent Destailleur
fa999dfa65 Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
2017-11-06 09:25:14 +01:00
Frédéric FRANCE
ea910adeb2 Merge branch 'develop' into accountingexport 2017-11-05 21:11:41 +01:00
Frédéric FRANCE
bb252846e3 accounting export admin config 2017-11-05 11:48:41 +01:00
Alexandre SPANGARO
7d524f3364 Small code improve on bookkeeping card movement 2017-11-05 08:45:05 +01:00
Laurent Destailleur
141bef0b8a Fix translation and css 2017-11-04 15:21:35 +01:00
Alexandre SPANGARO
7e3103356b Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-04 07:14:28 +01:00
Laurent Destailleur
cd70e1506b Work on common core code 2017-11-03 17:20:08 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Laurent Destailleur
458be3c814 Clean translation files 2017-11-03 14:38:00 +01:00
Alexandre SPANGARO
2d17e4094c Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00