Commit Graph

6072 Commits

Author SHA1 Message Date
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Frédéric FRANCE
9a001ed203 Translation 2018-04-14 09:51:11 +02:00
Laurent Destailleur
519ee64c1f Translation 2018-04-13 00:42:08 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
a8878c3f7e FIX #6295 2018-04-12 15:17:15 +02:00
Laurent Destailleur
698f5c165a Merge pull request #8430 from atm-florian/dev_mailtouser
NEW : Can select from the user list into send form email (For field to and CC)
2018-04-11 17:55:40 +02:00
Laurent Destailleur
ea35a445a1 Merge branch 'develop' into 8.0-a15 2018-04-11 13:17:12 +02:00
Laurent Destailleur
bf1e3705fb Fix english 2018-04-11 12:47:10 +02:00
Laurent Destailleur
aa3c81c8bd Translation 2018-04-11 10:15:54 +02:00
Laurent Destailleur
5cdebb4daa Fix typo 2018-04-11 10:00:53 +02:00
Laurent Destailleur
0dea2b08c2 Fix english translation of nb 2018-04-10 16:39:45 +02:00
Laurent Destailleur
7df0d01e01 Fix translation 2018-04-10 16:30:18 +02:00
Laurent Destailleur
a06c9df86c Fix translation 2018-04-10 16:01:32 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Laurent Destailleur
6529043182 Clean code 2018-04-08 10:49:59 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Laurent Destailleur
4d2d9193b9 Work on VAT reports to use option MAIN_INFO_VAT_RETURN 2018-04-07 15:47:13 +02:00
Alexandre SPANGARO
741a14993a NEW Add file number in accountant card and update export filename 2018-04-07 06:21:49 +02:00
Laurent Destailleur
ee870342ef Fix navigation/translation 2018-04-06 20:22:20 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Laurent Destailleur
2d547abaa9 Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
9d9f3ddf85 Merge pull request #8502 from ATM-Marc/NEW_create_from_list
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
b59d8a6473 Merge pull request #8501 from ATM-Consulting/develop_atm
NEW: send mails from project card
2018-04-05 16:39:06 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Frédéric FRANCE
90957b3a72 Update mails.lang 2018-04-04 16:00:33 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
299859d0c4 add action to remove from cycle 2018-04-03 17:34:20 +02:00
John
70321a8b71 add button to remove from cycle 2018-04-03 15:12:44 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Alexandre SPANGARO
2a50e9e6c4 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-02 19:54:30 +02:00
Alexandre SPANGARO
3779b6ff1c Update work on assets type 2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04 Update works 2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Laurent Destailleur
a9ac7e1f29 Debug inventory module 2018-03-31 19:20:38 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Marc de Lima Lucio
1cc816ff38 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-29 17:36:30 +02:00
Laurent Destailleur
b5c53e9d76 Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse
NEW: default warehouse field for products
2018-03-29 13:51:37 +02:00
Laurent Destailleur
22d64a2768 Dolibarize module ticket 2018-03-29 12:50:03 +02:00
Marc de Lima Lucio
9ba902504e FIX: langs 2018-03-29 09:38:16 +02:00
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
Laurent Destailleur
d1e9a4719b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
2018-03-27 12:27:15 +02:00
Laurent Destailleur
b44e791c0a Work on vat reports 2018-03-26 21:39:18 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
2018-03-26 14:13:40 +02:00