Laurent Destailleur
|
7cf7bf6e45
|
Code comment
|
2018-02-23 16:26:23 +01:00 |
|
Laurent Destailleur
|
f3e1e81219
|
Fix update of extrafield password that are crypted
|
2018-02-23 16:11:25 +01:00 |
|
Laurent Destailleur
|
0a79550f43
|
Fix oldcopy must be saved before update_extras
|
2018-02-23 16:11:00 +01:00 |
|
Laurent Destailleur
|
787a137509
|
Add column for accounting doc
|
2018-02-23 15:38:39 +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
|
812911bd44
|
Fix type of expense report output in PDF
|
2018-02-23 15:33:42 +01:00 |
|
Laurent Destailleur
|
f002c84a76
|
Fix type of expense report output in PDF
|
2018-02-23 15:33:00 +01:00 |
|
Laurent Destailleur
|
93a8176813
|
Fix do not encrypt if empty
|
2018-02-23 15:28: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 |
|
Laurent Destailleur
|
cc618e886f
|
Fix extrafield password must be >= than 64 for password_hash
|
2018-02-23 13:19:33 +01:00 |
|
Laurent Destailleur
|
8b479a05ad
|
Can add property in password extrafield (prepare to choose encrypt algo)
|
2018-02-23 12:34:25 +01:00 |
|
Laurent Destailleur
|
f7ecac8734
|
Fix look and feel v7
|
2018-02-23 11:40:56 +01:00 |
|
Laurent Destailleur
|
b3d968d4a1
|
Fix look and feel v7
|
2018-02-23 11:40:20 +01:00 |
|
Laurent Destailleur
|
b6737d3607
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2018-02-23 11:24:45 +01:00 |
|
Laurent Destailleur
|
82ae65b18d
|
NEW Can get template of email from its label
|
2018-02-23 11:23:36 +01:00 |
|
Laurent Destailleur
|
829de06bf6
|
Fix error management
|
2018-02-23 11:23:04 +01:00 |
|
Laurent Destailleur
|
194f5a2cef
|
Fix substitution key
|
2018-02-23 11:03:48 +01:00 |
|
Laurent Destailleur
|
d8f8e76bee
|
Provide context to trigger
|
2018-02-23 10:39:39 +01:00 |
|
Laurent Destailleur
|
3f9a9f20ce
|
Fix missing substitution key
|
2018-02-22 17:06:18 +01:00 |
|
Laurent Destailleur
|
420fe3a07a
|
Clean code
|
2018-02-22 17:05:45 +01:00 |
|
Laurent Destailleur
|
76543023a1
|
Fix missing substitution key
|
2018-02-22 17:05:24 +01:00 |
|
Laurent Destailleur
|
a27ed54128
|
Fix sort order of email templates
|
2018-02-22 16:40:48 +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
|
bc0993d6cd
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-02-22 12:17:25 +01:00 |
|
Laurent Destailleur
|
479c4b4d77
|
Fix look and feel v7
|
2018-02-22 12:15:11 +01:00 |
|
Laurent Destailleur
|
51cfb9795e
|
Fix bad picto
|
2018-02-22 11:26:41 +01:00 |
|
Laurent Destailleur
|
9114a28e88
|
Fix: missing the reposition
|
2018-02-21 22:43:25 +01:00 |
|
Laurent Destailleur
|
0d0451e5c7
|
Code comment
|
2018-02-21 22:43:03 +01:00 |
|
Laurent Destailleur
|
f03fcef2d5
|
Fix: missing the reposition
|
2018-02-21 22:41:02 +01:00 |
|
Laurent Destailleur
|
0c59d536ba
|
More accurante message
|
2018-02-21 22:01:46 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
423918b9ff
|
Include notrigger
|
2018-02-21 11:41:52 +01:00 |
|
Laurent Destailleur
|
0ff148da1f
|
Fix import of chart account
|
2018-02-21 11:22:27 +01:00 |
|
Laurent Destailleur
|
aac59f3e21
|
Fix escaping
|
2018-02-21 11:09:17 +01:00 |
|
Laurent Destailleur
|
72c1357c9b
|
NEW Section of files generated by mass action not visible if empty
|
2018-02-21 11:02:45 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
34135e0a13
|
Fix extrafield date or datetime with bad timezone
|
2018-02-20 19:20:47 +01:00 |
|
Laurent Destailleur
|
8b54a80593
|
Fix oldcopy not saved before calling trigger
|
2018-02-20 19:20:03 +01:00 |
|
Laurent Destailleur
|
e465b0c40e
|
Fix extrafield date or datetime with bad timezone
|
2018-02-20 19:19:27 +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
|
809ef1bd00
|
FIX Trigger *_MODIFY must be called when editing a property event extra.
Clean duplicate trigggers "*_CLONE"
|
2018-02-20 18:09:38 +01:00 |
|
Laurent Destailleur
|
48d250b201
|
Help to understand
|
2018-02-20 15:55:58 +01:00 |
|
Laurent Destailleur
|
15ba0c3b49
|
Close #7989 Merge manually in existing class
|
2018-02-20 15:35:42 +01:00 |
|
Laurent Destailleur
|
c9c75d0c9c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-02-20 15:27:27 +01:00 |
|
Laurent Destailleur
|
522caa4cf0
|
Merge #7989
|
2018-02-20 15:26:40 +01:00 |
|
Laurent Destailleur
|
7f419a29e7
|
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill
fix the bill replacement with discounts #8028
|
2018-02-20 15:19:19 +01:00 |
|
Laurent Destailleur
|
01c2971f4f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 15:08:17 +01:00 |
|
Laurent Destailleur
|
9690e68bfb
|
Merge pull request #8206 from fmarcet/5.0
Fix: Barcode type on massive init
|
2018-02-20 15:07:53 +01:00 |
|
Laurent Destailleur
|
f207e91643
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/holiday/define_holiday.php
htdocs/main.inc.php
htdocs/societe/class/societe.class.php
|
2018-02-20 15:06:41 +01:00 |
|