Laurent Destailleur
|
e5c898e0d6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
|
2017-05-10 00:48:27 +02:00 |
|
Laurent Destailleur
|
b8b91db007
|
Use function top_httphead to include headers in pages.
|
2017-05-09 21:46:57 +02:00 |
|
Laurent Destailleur
|
39b4549813
|
Make option MAIN_SECURITY_CSRF_WITH_TOKEN more visible
|
2017-05-09 19:43:50 +02:00 |
|
Laurent Destailleur
|
6d01bd712d
|
FIX Better sanitizing of search all parameter.
|
2017-05-09 19:36:10 +02:00 |
|
Laurent Destailleur
|
667e3c2876
|
Add another security sanitizing option
|
2017-05-09 19:26:28 +02:00 |
|
Laurent Destailleur
|
0b97ee42cf
|
NEW Can use a credit note into a "down payment/deposit".
|
2017-05-09 18:15:50 +02:00 |
|
Laurent Destailleur
|
1748f1d451
|
Better tooltip for computed field
|
2017-05-09 17:00:07 +02:00 |
|
Laurent Destailleur
|
081d0e7ec2
|
Debug module RH. Edition of user bank account is ok.
|
2017-05-09 11:09:21 +02:00 |
|
Laurent Destailleur
|
cf04e5a6e0
|
Fix duplicate id
|
2017-05-09 10:45:49 +02:00 |
|
Laurent Destailleur
|
63259295c6
|
Look and feel v6
|
2017-05-09 10:41:03 +02:00 |
|
Laurent Destailleur
|
9fe28c9b2c
|
NEW Can disable all overwrote translations in one click.
|
2017-05-09 10:08:04 +02:00 |
|
Laurent Destailleur
|
05d6c2cd75
|
Fix no more use of constant
|
2017-05-09 01:36:20 +02:00 |
|
Laurent Destailleur
|
c26d24e97d
|
Work on module builder
|
2017-05-09 00:00:09 +02:00 |
|
Laurent Destailleur
|
1371af5f66
|
Work on modulebuilder template
|
2017-05-08 21:04:23 +02:00 |
|
Laurent Destailleur
|
dd71fdc82f
|
Work on modulebuilder template
|
2017-05-08 21:00:23 +02:00 |
|
Laurent Destailleur
|
d7d212bbe1
|
Fix bad link to list
|
2017-05-08 12:31:37 +02:00 |
|
Laurent Destailleur
|
fd6518182b
|
Fix can force tls version
|
2017-05-08 12:08:43 +02:00 |
|
Laurent Destailleur
|
46ff62fc87
|
Work on inventory module debug
|
2017-05-06 22:28:07 +02:00 |
|
Laurent Destailleur
|
f4447f9c87
|
Fix bookmark jump
|
2017-05-06 21:39:00 +02:00 |
|
Laurent Destailleur
|
910a925167
|
NEW Add last activation author and ip of modules
|
2017-05-06 20:43:14 +02:00 |
|
Laurent Destailleur
|
d948447600
|
Add button to disable all personalized default values in one click.
|
2017-05-06 17:08:38 +02:00 |
|
Laurent Destailleur
|
44bdf91715
|
Add badge with nb of imported calendard on user tab
|
2017-05-06 12:43:45 +02:00 |
|
Laurent Destailleur
|
e8c60642e6
|
Translation fix
|
2017-05-06 03:21:47 +02:00 |
|
Laurent Destailleur
|
9b90e7aa09
|
Minor fix
|
2017-05-06 02:24:52 +02:00 |
|
Laurent Destailleur
|
56140ae572
|
Work on default focus
|
2017-05-06 01:09:22 +02:00 |
|
Laurent Destailleur
|
cea835744c
|
Look and feel v6
|
2017-05-05 23:06:46 +02:00 |
|
Laurent Destailleur
|
5e6b2897ad
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-05 22:57:52 +02:00 |
|
Laurent Destailleur
|
d53654e64f
|
Look and feel v6
|
2017-05-05 20:45:06 +02:00 |
|
Laurent Destailleur
|
fb58dfa898
|
Merge pull request #6752 from grandoc/new_branch_24_04
Update code using new css class
|
2017-05-05 19:08:38 +02:00 |
|
Laurent Destailleur
|
2e5c32eb62
|
Merge pull request #6748 from atm-florian/5.0
FIX : #6747
|
2017-05-05 19:06:14 +02:00 |
|
Laurent Destailleur
|
d7e10085b8
|
Clean code. Using 2 different key for a param is not more allowed.
|
2017-05-05 18:42:11 +02:00 |
|
Laurent Destailleur
|
806157ae40
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-05 17:52:22 +02:00 |
|
Laurent Destailleur
|
57e540af53
|
For better compatibility with module for 6.0
|
2017-05-05 17:46:40 +02:00 |
|
Laurent Destailleur
|
15d20497c8
|
FIX #6795 #6796
|
2017-05-05 17:46:22 +02:00 |
|
Laurent Destailleur
|
a8292ce990
|
Code comment
|
2017-05-05 17:27:16 +02:00 |
|
Laurent Destailleur
|
dc9cbed866
|
Look and feel v6
|
2017-05-05 17:04:35 +02:00 |
|
Laurent Destailleur
|
fc5f4007a1
|
Debug accountancy module. Page for bank journalization is still KO.
|
2017-05-05 16:54:05 +02:00 |
|
Laurent Destailleur
|
885a636351
|
Debug new journal list page
|
2017-05-05 16:35:05 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|
Laurent Destailleur
|
b7f7683e5a
|
Merge pull request #6774 from aspangaro/6.0-multijournal
Finish to move accountancy journals list to page like dictionnary
|
2017-05-05 14:21:55 +02:00 |
|
Laurent Destailleur
|
91c505c9c9
|
Update llx_accounting.sql
|
2017-05-05 14:20:59 +02:00 |
|
Laurent Destailleur
|
dfa81bc806
|
Merge pull request #6792 from aspangaro/6.0-agiris
New : Accountancy - Add export model towards Agiris
|
2017-05-05 14:15:51 +02:00 |
|
Laurent Destailleur
|
eb2124bfc8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-05-05 14:14:53 +02:00 |
|
Laurent Destailleur
|
2120b9af85
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
|
2017-05-05 14:14:21 +02:00 |
|
Laurent Destailleur
|
e830ea6714
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-05-05 14:02:10 +02:00 |
|
Laurent Destailleur
|
8a37eeea74
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-05-05 14:02:02 +02:00 |
|
Laurent Destailleur
|
919d5b2ef3
|
Fix missing translation
|
2017-05-05 14:01:32 +02:00 |
|
Laurent Destailleur
|
a1ac3b470b
|
Change menu for setup of predefined emails
|
2017-05-05 14:01:20 +02:00 |
|
Laurent Destailleur
|
d60e98a797
|
No payment information on a supplier proposal by default.
|
2017-05-05 13:50:14 +02:00 |
|
Laurent Destailleur
|
0bffac6dc4
|
Use constant vor status.
|
2017-05-05 13:43:43 +02:00 |
|