Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,691 Commits 36 Branches 190 Tags
2e511badf99f321ecd1a9c86b0dbb05662cb3fd6
Commit Graph

4957 Commits

Author SHA1 Message Date
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Regis Houssin
e038e1a2f5 Fix: missing select2 combobox 2017-09-12 09:27:59 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
dcc9cb4a16 Some fixes in various payment 2017-09-11 14:29:27 +02:00
Laurent Destailleur
029f1c411f Merge pull request #7357 from hregis/6.0_medias 
Fix: some problems with medias in multicompany
 2017-09-11 14:13:51 +02:00
Laurent Destailleur
d13c4b7b84 Better autosize of extrafields 2017-09-11 01:05:55 +02:00
Laurent Destailleur
25ec124411 Better autosize of extrafields 2017-09-11 00:19:42 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Regis Houssin
762b4eb876 Fix: some problems with medias in multicompany 2017-09-09 17:48:04 +02:00
Laurent Destailleur
4f52871c67 Merge pull request #7345 from AXeL-dev/develop 
fix hidepriceinlabel when using ajax autocompleter
 2017-09-08 21:22:38 +02:00
Laurent Destailleur
75172966c2 Fix selection of email templates 2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
AXeL-dev
a615a46a5a fix hidepricelabel when using ajax autocompleter 2017-09-08 11:06:55 +01:00
Laurent Destailleur
f3b1f89bae Fix warning 2017-09-03 15:21:37 +02:00
Laurent Destailleur
f963afa505 Fix warning 2017-09-03 15:21:17 +02:00
Laurent Destailleur
3126676ffb FIX inert of extra field must not change extrafield values in memory 2017-09-03 14:27:46 +02:00
Laurent Destailleur
c6cbf2345d FIX Management of default value in extrafields when default is '0' 2017-09-03 14:25:54 +02:00
Laurent Destailleur
a4d3e48773 FIX inert of extra field must not change extrafield values in memory 2017-09-03 12:40:49 +02:00
Laurent Destailleur
3beee569a6 Enhance support of default value in extrafields 2017-09-02 15:18:41 +02:00
Laurent Destailleur
9923c87fd8 Fix translation of extrafields 2017-09-02 13:03:14 +02:00
Laurent Destailleur
36eb21c135 Fix translation of extrafields 2017-09-02 13:02:01 +02:00
Laurent Destailleur
e5400a4a36 Fix translation of extrafields 2017-09-02 13:01:41 +02:00
Laurent Destailleur
7f7b4cddb4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-02 12:37:02 +02:00
Laurent Destailleur
015bc51c43 Fix regression adding a false error message 2017-09-02 12:17:29 +02:00
Laurent Destailleur
32c6acefd2 Merge pull request #7321 from ruistrecht-alt/NEW_Add_region_to_state/province_form_field 
NEW Added Region name to state/province form field
 2017-09-02 00:10:25 +02:00
Rui Strecht
1ee0077e4e Fix: Added name to contributors 2017-09-01 16:10:19 +01:00
Laurent Destailleur
4660bc58fc Fix nostop option 2017-09-01 17:08:47 +02:00
Laurent Destailleur
bda507d191 Fix nostop option 2017-09-01 17:07:26 +02:00
Laurent Destailleur
223e1b1cd4 Fix missing the nostop tag 2017-09-01 16:55:09 +02:00
Laurent Destailleur
920d6270c3 Fix missing the nostop tag 2017-09-01 16:54:06 +02:00
Rui Strecht
9443cb0c1b NEW Added Region name to state/province form field 2017-09-01 15:53:06 +01:00
Laurent Destailleur
2768878618 FIX Bad condition on sms log debug 2017-09-01 16:39:49 +02:00
Laurent Destailleur
e663314cb1 Clean code 2017-09-01 16:38:56 +02:00
Laurent Destailleur
c02355c8c3 FIX Bad condition on sms log debug 2017-09-01 16:37:45 +02:00
Laurent Destailleur
61cf69f2bb NEW Include a color syntaxed HTML editor for emailing edition. 2017-09-01 13:09:13 +02:00
Laurent Destailleur
9146bb336e Work on merging all payment modes in one page 2017-08-31 03:34:57 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
c382ca22b8 FIX link in to email and option for tls 2017-08-28 00:09:21 +02:00
Laurent Destailleur
b12800d174 FIX link in to email and option for tls 2017-08-28 00:06:19 +02:00
Laurent Destailleur
502ac19a0a Fix regression on categories 2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a NEW Can set language on extrafields 2017-08-27 12:12:02 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Laurent Destailleur
782b85ba13 Merge pull request #7285 from hregis/6.0_bug 
Fix: avoid error "A non-numeric value encountered"
 2017-08-26 19:31:16 +02:00
Laurent Destailleur
7329d21dcd Fix lang selection 2017-08-25 17:13:33 +02:00
Laurent Destailleur
9d380a8b8a NEW Can edit the language into the email templates editor. 2017-08-25 16:38:45 +02:00
Laurent Destailleur
4337001418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/list.php
 2017-08-24 14:26:45 +02:00
Laurent Destailleur
8e6546497a Code comment 2017-08-24 13:43:36 +02:00