Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 20:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8581 Commits

Author SHA1 Message Date
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
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
8493d9f62e FIX #8163 2018-02-15 15:27:06 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
Laurent Destailleur
18acff5e57 Fix avoid error when homepage not set 2018-02-15 01:29:51 +01:00
Laurent Destailleur
0fc302fe98 Sync transifex 2018-02-15 00:06:43 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Laurent Destailleur
8783857aa5 Fix tooltip of website editor 2018-02-14 20:33:48 +01:00
Regis Houssin
fa2fddcdc1 Fix: Update entity field in llx_user_rights and llx_usergroup_rights 2018-02-14 14:30:39 +01:00
Laurent Destailleur
36ac380cac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 22:26:48 +01:00
Laurent Destailleur
1c9f543fd5 Translation 2018-02-12 15:55:37 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +01:00
Laurent Destailleur
2fc97e5c8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:01:34 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f Fix journalization protection 2018-02-12 12:02:01 +01:00
Laurent Destailleur
ec66bde3c9 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:15:24 +01:00
Laurent Destailleur
e984d7df9f NEW Add total of time spent in timespent page at top of page too. 2018-02-09 23:52:43 +01:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
Laurent Destailleur
26ee7ec5be Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2018-02-08 17:27:36 +01:00
Laurent Destailleur
b5c12b346c Fix typo 2018-02-08 16:50:43 +01:00
Laurent Destailleur
19a0f552c9 Fix td balance 2018-02-08 16:50:01 +01:00
Laurent Destailleur
493a9a7289 Fix td balance 2018-02-08 16:49:28 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
9a4de796e1 Merge pull request #8048 from ATM-Nicolas/add_margin_filters 
NEW : Add margin filters
 2018-02-08 15:15:30 +01:00
Laurent Destailleur
475b89bac1 Merge branch 'develop' into new_order_min_amount 2018-02-08 14:20:53 +01:00
Laurent Destailleur
d8872a412b Fix numbering for expense report 2018-02-07 15:52:57 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Laurent Destailleur
9962d36dbc Fix translation 2018-02-06 18:39:11 +01:00
Laurent Destailleur
930d58ab96 Fix import supplier product price vat 2018-02-06 10:03:06 +01:00
Laurent Destailleur
bf7ae08c48 sync transifex 2018-02-06 01:17:50 +01:00
Laurent Destailleur
180f9918c7 Transifex sync 2018-02-05 20:43:50 +01:00
Laurent Destailleur
51847dfa8a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2018-02-05 15:34:50 +01:00