Commit Graph

9016 Commits

Author SHA1 Message Date
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Laurent Destailleur
a765dba570 Fix trad 2018-03-06 09:06:49 +01:00
Alexandre SPANGARO
4a46ffc5d8 Add information in VAT admin page 2018-03-06 05:02:09 +01:00
Laurent Destailleur
0cfa19ee09 NEW Online payment of invoice and subscription record the payment
automatically.
2018-03-06 00:12:23 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned)
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
d8b2d1f8c2 Add example of test credit card 2018-03-04 12:11:28 +01:00
Laurent Destailleur
01b0336e9b Fix tooltip on delete button 2018-03-03 12:10:27 +01:00
Marc de Lima Lucio
451d943927 NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts) 2018-03-02 16:48:25 +01:00
Laurent Destailleur
2e6a2b59a0 Trans 2018-03-02 13:44:17 +01:00
Laurent Destailleur
2368cb615f Look and feel v8 2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
f545d2a134 NEW Can add filter actiontype and notactiontype on event ical export 2018-02-28 20:06:28 +01:00
Laurent Destailleur
7d42ceab20 Use normalized substitution key 2018-02-28 19:50:40 +01:00
Laurent Destailleur
e2c7585ae7 NEW Support alternative aliases of page name in website 2018-02-28 14:36:22 +01:00
Laurent Destailleur
03858d73b1 NEW Add extrafield type "html" 2018-02-27 17:30:13 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
Laurent Destailleur
8d963adb43 Fix error message 2018-02-26 21:30:31 +01:00
Marc de Lima Lucio
7ca5ac03cc FIX: discount card: only display relevant discounts types (customer/supplier) 2018-02-26 17:40:31 +01:00
Laurent Destailleur
82475e2e5f WIP Option PROJECT_BILL_TIME_SPENT 2018-02-26 14:28:51 +01:00
Laurent Destailleur
cb45c86711 WIP Option PROJECT_BILL_TIME_SPENT 2018-02-26 13:21:16 +01:00
Laurent Destailleur
46c2f098e0 NEW Can enter time spent from the list of time spent of project 2018-02-26 12:21:01 +01:00
kkhelifa-opendsi
90f4c985f6 Merge branch 'develop' into product_supplier_buyprice_multicurrency 2018-02-26 09:54:09 +01:00
Laurent Destailleur
b42193b9ea Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-23 15:34:24 +01:00
Laurent Destailleur
953001c7ab Fix bad naming of column 2018-02-23 15:16:49 +01:00
Laurent Destailleur
863cab362f NEW Cat set the encryption algorithm for extrafields of type password 2018-02-23 14:38:41 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
John
b88e7fdcf9 move button to dialog footer 2018-02-22 17:21:12 +01:00
Laurent Destailleur
b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
0c59d536ba More accurante message 2018-02-21 22:01:46 +01:00
John
629b8e618e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-02-21 11:45:23 +01:00
Laurent Destailleur
71cbcce3a2 NEW Can select sample to use when creating a new page 2018-02-20 18:10:11 +01:00
Laurent Destailleur
48d250b201 Help to understand 2018-02-20 15:55:58 +01:00
John
46b235c139 add auto select model when select type on create invoice 2018-02-20 15:08:57 +01:00
Laurent Destailleur
5f51af505f NEW Can delete dir content in media and ECM module recursively 2018-02-19 23:52:45 +01:00
Laurent Destailleur
9230c6757b Fix error when removing dir with some subdirs 2018-02-19 23:31:35 +01:00
Laurent Destailleur
bfbe03d55d Fix tooltip doc 2018-02-19 21:57:30 +01:00
Laurent Destailleur
3eef9fd57a Fix doc 2018-02-19 21:31:03 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
44b0d1ca0f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-19 17:33:20 +01:00
Laurent Destailleur
f3114765a3 Work on website module 2018-02-19 16:46:29 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Laurent Destailleur
60a77a6d85 Add option to grab images into same dir or subdir 2018-02-19 14:56:37 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
46c941c823 Translation 2018-02-16 23:57:35 +01:00