Laurent Destailleur
|
2b1f57f01e
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
|
2016-03-18 11:54:14 +01:00 |
|
Laurent Destailleur
|
12bb3932d0
|
NEW Add filter on a keyword, status and nature into list of modules
|
2016-03-14 19:40:52 +01:00 |
|
Laurent Destailleur
|
b16ef1b4f4
|
Prepare 3.9 release
|
2016-03-13 12:33:04 +01:00 |
|
Laurent Destailleur
|
930dd55e17
|
Prepare 3.9 release
|
2016-03-13 12:31:10 +01:00 |
|
Laurent Destailleur
|
543f5cef63
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
|
2016-03-13 01:31:12 +01:00 |
|
Laurent Destailleur
|
e0809fc750
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/compta/facture.php
htdocs/product/document.php
|
2016-03-12 18:40:50 +01:00 |
|
Laurent Destailleur
|
0727ee88e6
|
More robust initdemo script.
|
2016-03-12 18:33:32 +01:00 |
|
Laurent Destailleur
|
a8602dbec2
|
Fix alignement on extrafields
|
2016-03-10 16:00:44 +01:00 |
|
Laurent Destailleur
|
d1777a6783
|
Replace function rand with mt_rand (prepare php 8)
|
2016-03-05 15:01:25 +01:00 |
|
Laurent Destailleur
|
b46c23ab35
|
Fix bad file name
|
2016-02-25 03:19:11 +01:00 |
|
Laurent Destailleur
|
a0ccd8b0d4
|
Enhance purge script
|
2016-02-25 01:05:39 +01:00 |
|
Laurent Destailleur
|
017b607e53
|
Better script name
|
2016-02-25 01:05:03 +01:00 |
|
Laurent Destailleur
|
c3eb60325b
|
Reduce nb of dirs
|
2016-02-24 18:18:24 +01:00 |
|
Laurent Destailleur
|
9f240c6c88
|
Better import examples
|
2016-02-24 17:27:28 +01:00 |
|
Laurent Destailleur
|
d5112c0c82
|
Better sample import scripts
|
2016-02-24 12:23:34 +01:00 |
|
Laurent Destailleur
|
f55c1014ee
|
Add more example of import scripts
|
2016-02-23 23:03:52 +01:00 |
|
Laurent Destailleur
|
769843f919
|
Correct multiprice import
|
2016-02-23 20:07:22 +01:00 |
|
Laurent Destailleur
|
57aebe4e1f
|
Add script to import products
|
2016-02-23 20:00:07 +01:00 |
|
Laurent Destailleur
|
b591ba1280
|
Uncomment line
|
2016-02-22 12:56:41 +01:00 |
|
Laurent Destailleur
|
fe06ad39c0
|
NEW Add a tool for developers to purge database with no loose of setup
|
2016-02-22 12:41:49 +01:00 |
|
Laurent Destailleur
|
c07bb2dd5c
|
Add translation file for website module
|
2016-02-19 18:51:31 +01:00 |
|
Laurent Destailleur
|
07afad41a2
|
Add feature to select number of record into list in the skeleton
template.
|
2016-02-13 10:54:06 +01:00 |
|
Laurent Destailleur
|
9da0164d90
|
Uniformize code for lists
|
2016-02-07 15:50:48 +01:00 |
|
Laurent Destailleur
|
a435d0e147
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-23 14:56:45 +01:00 |
|
Laurent Destailleur
|
5b0d06e48c
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-23 14:56:16 +01:00 |
|
Laurent Destailleur
|
c0e5fdee0e
|
Update demo
|
2016-01-23 14:55:05 +01:00 |
|
Laurent Destailleur
|
097251ec7f
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-23 12:29:22 +01:00 |
|
Laurent Destailleur
|
615ffe5417
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-23 12:28:34 +01:00 |
|
Laurent Destailleur
|
200a6d3c3b
|
Update demo data
|
2016-01-23 12:27:49 +01:00 |
|
Laurent Destailleur
|
a3c273aec8
|
Update demo datas
|
2016-01-23 12:07:57 +01:00 |
|
Laurent Destailleur
|
f8cd4eb166
|
Update demo
|
2016-01-23 12:04:09 +01:00 |
|
Laurent Destailleur
|
4df584e57b
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-01-23 11:51:56 +01:00 |
|
Laurent Destailleur
|
dbaa43f3be
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
|
2016-01-23 11:45:39 +01:00 |
|
Laurent Destailleur
|
1012fb8be1
|
Update demo data
|
2016-01-22 19:11:46 +01:00 |
|
Laurent Destailleur
|
4c3f9db2a1
|
Add demo data
|
2016-01-22 18:10:19 +01:00 |
|
Laurent Destailleur
|
540bb04cac
|
Update demo init data
|
2016-01-22 14:29:44 +01:00 |
|
Laurent Destailleur
|
93b2013aa7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
|
2016-01-22 03:29:55 +01:00 |
|
Laurent Destailleur
|
cceeefb7c2
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/societe/index.php
|
2016-01-22 03:25:30 +01:00 |
|
Laurent Destailleur
|
03461d124a
|
Fix activation of cron jobs by external module
Clean code for task lists pages.
|
2016-01-19 23:45:03 +01:00 |
|
Laurent Destailleur
|
6bccac5691
|
NEW Add Expense report to approve into workboard
NEW Selection of boxes is move on top
|
2016-01-18 11:35:45 +01:00 |
|
Laurent Destailleur
|
af4d57b461
|
Complete demo samples
|
2016-01-16 17:41:17 +01:00 |
|
Laurent Destailleur
|
9586096f16
|
More code comment
|
2016-01-13 13:31:58 +01:00 |
|
Regis Houssin
|
694530bfae
|
Fix: Gives the possibility to the module, to provide his own family info
and position of this family. (canceled $this->family)
|
2016-01-10 13:00:48 +01:00 |
|
Laurent Destailleur
|
2f8fc05cdb
|
Fix: QRcode must not be random
|
2015-12-20 21:28:05 +01:00 |
|
Laurent Destailleur
|
f25a9030eb
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
|
2015-12-18 22:12:03 +01:00 |
|
Laurent Destailleur
|
dd3f5a32d3
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
|
2015-12-18 21:20:12 +01:00 |
|
Laurent Destailleur
|
dc9c5ed5ef
|
Enhance transifex sync
|
2015-12-18 18:25:09 +01:00 |
|
Laurent Destailleur
|
ba3c8de785
|
Update doc comment to make things cleaner to avoid confusion between old
deprecated doActions of canvas and doActions of triggers.
|
2015-12-17 14:01:22 +01:00 |
|
Laurent Destailleur
|
6133298e58
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-16 19:27:23 +01:00 |
|
Laurent Destailleur
|
f87ccc97e2
|
Miscellaneous fixes
|
2015-12-16 19:26:50 +01:00 |
|