Commit Graph

1055 Commits

Author SHA1 Message Date
Laurent Destailleur
24a798ed2f Fix restore translation for ModuleCompanyCode... 2016-07-07 14:13:33 +02:00
florian HENRY
1bb28648c4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353

Conflicts:
	build/pad/DoliWamp.pml
	build/pad/Dolibarr.pml
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
2016-07-07 09:05:13 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
ce3f45c2a2 Debug of doliwamp for 4.0 2016-07-03 13:14:33 +02:00
Laurent Destailleur
3611161b67 Fix custom code should not appears on services 2016-06-30 19:35:11 +02:00
Laurent Destailleur
bc38bc63ca Fix minor bug in direct printing with google cloud print 2016-06-26 21:18:44 +02:00
Laurent Destailleur
9ebf7a1e35 Try to fix the group_concat function for pgsql. 2016-06-25 02:21:54 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
b01eed697e Fix sort on thirdparty on bank transaction list 2016-06-20 11:30:43 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
f817b562ad Clean language files 2016-06-18 17:17:45 +02:00
Laurent Destailleur
94b7e176a6 Clean language files 2016-06-18 16:46:21 +02:00
Laurent Destailleur
de76f2a9aa Clean language files 2016-06-18 15:50:37 +02:00
Laurent Destailleur
d192438eae Enhance tool to clean language files 2016-06-18 12:50:15 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
404847ed32 Fix sql files not included into the fixdosfiles.sh 2016-06-07 11:10:09 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby
dates.
2016-05-17 18:19:36 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
f9ded46a99 Start debug 4.0 2016-05-17 02:41:06 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture
change before the freeze)
2016-04-23 15:37:22 +02:00
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
d735f5dc70 FIX lost css change 2016-04-22 11:10:20 +02:00
Laurent Destailleur
c2de7adb32 Minor PHPCS fixes 2016-04-21 03:18:42 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
Laurent Destailleur
e47c9946b2 More complete cleaning tools 2016-04-08 15:09:31 +02:00
Laurent Destailleur
8222624ff0 NEW Can select fields to show on list also for list of customer orders,
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0 Work on select fields for orders, invoices and shipments 2016-04-08 01:00:02 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5 FIX Filter/search on extrafields on lists 2016-04-04 16:02:29 +02:00
Laurent Destailleur
482581bb84 Update module descriptor example with new fields 2016-04-01 14:52:38 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function"
This reverts commit 87cd6e1e40.
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
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
Laurent Destailleur
c03320ff0b Merge pull request #4224 from aspangaro/develop-fec
Complete information on FEC format - french law
2015-12-16 19:10:17 +01:00
Laurent Destailleur
750443040a Enhance ruleset.xml description 2015-12-15 09:29:21 +01:00
aspangaro
5770407464 Complete information on FEC format - french law 2015-12-15 06:10:33 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
2015-12-13 21:34:36 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00