Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 35 Branches 179 Tags 1.7 GiB
afee39ea68
Commit Graph

1228 Commits

Author SHA1 Message Date
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
Laurent Destailleur
00aa5aace7 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	dev/codesniffer/ruleset.xml
 2015-12-04 12:14:24 +01:00
Laurent Destailleur
d2b221cfd1 Upgrade PHPCS rules 2015-12-04 10:22:27 +01:00
Laurent Destailleur
6df4948a73 Fix text 2015-12-01 03:12:12 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Laurent Destailleur
eb02b8d944 Add fec format into iso-normes dir. 2015-11-27 09:05:29 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Laurent Destailleur
85d788d43a Fix crazy phpcs test 2015-11-25 23:26:31 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it 
appears into list of modules.
 2015-11-17 00:58:12 +01:00
Laurent Destailleur
43f3999234 Clean demo file 2015-11-16 00:22:14 +01:00
Laurent Destailleur
74a4006a84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-12 21:25:30 +01:00
Laurent Destailleur
b307431348 Add example of email header to use when sending email from thirdparty 
card
 2015-11-12 19:01:57 +01:00
philippe grand
c712532bf6 [Qual] Uniformize code 2015-11-12 11:59:15 +01:00
Laurent Destailleur
327d764284 Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr 
into GPCsolutions-dolibarr-php7

Conflicts:
	.gitignore
 2015-11-11 19:03:36 +01:00
Laurent Destailleur
59a79442b0 Enhance code for select field list feature. 
Add gender and employee on user list.
 2015-11-11 17:05:18 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF 
Previous one has been deprecated by upstream
 2015-11-09 12:21:08 +01:00
Laurent Destailleur
e689e9ed76 Debug generator de code 2015-11-05 21:33:05 +01:00
Laurent Destailleur
e7ecad2912 Add function getNomUrl on skeleton class. 2015-11-05 21:11:45 +01:00
Laurent Destailleur
f914873094 Better code generator 2015-11-05 20:31:51 +01:00
Laurent Destailleur
d2fa580f5d The code generator can generate a list.php page with all feature 
immediatly working (sort, extrafields, hooks, select fields to show...)
 2015-11-05 13:43:22 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
0b4a1b827a Update demo database 2015-11-04 16:21:44 +01:00
Laurent Destailleur
832afa139a Update skeleton to generate a list page and a card page. 2015-11-04 16:13:50 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Florian HENRY
6b8707516e FIX : skeleton class must use db->order rather than ORDER BY into 
fetchAll
 2015-10-14 10:05:42 +02:00
Laurent Destailleur
cfc70c7f92 Smaller image 2015-10-08 23:55:15 +02:00
Laurent Destailleur
2b17cd3353 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
Laurent Destailleur
f54a1ca367 CSS enhancement 2015-10-06 01:03:31 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
9e7ded94af Clean init/demo file. Demo init must contains real and clean values 2015-10-03 13:00:44 +02:00
Laurent Destailleur
d59f62cd75 Sync transifex 2015-09-30 01:25:35 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
c75f62ddb7 FIX icon into export profile may be not correctly output 2015-09-14 12:12:14 +02:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage 
Conflicts:
	htdocs/ftp/index.php
 2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1 Fix duplicate translation/encoding on setEventMessage 2015-09-12 12:52:07 +02:00
Laurent Destailleur
eb4c46ca3d Fix code generator 2015-09-10 12:13:29 +02:00
Laurent Destailleur
10aacb8811 Fix code generator 2015-09-08 20:08:47 +02:00
Laurent Destailleur
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/memory.lib.php
 2015-09-08 10:33:33 +02:00
Laurent Destailleur
5529ef7a50 Better doc 2015-09-07 20:53:16 +02:00
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Raphaël Doursenaud
e0312d048b Install TCPDF from composer 2015-09-04 19:06:04 +02:00
Laurent Destailleur
e17abbb59a Fix syntax error 2015-08-24 12:26:49 +02:00
Florian HENRY
dc5b7c4079 FIX : Fix demo dump data, date '0000-00-00 00:00:00' is not valid, 
replace by NOW()
 2015-08-13 10:07:26 +02:00
Florian HENRY
8562bc2369 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-08-03 10:08:22 +02:00
Laurent Destailleur
08d8da4b69 Removed useless files 2015-07-31 01:23:06 +02:00
Florian HENRY
e291ca2e23 FIX : Better FetchAll method 2015-07-29 11:52:23 +02:00
Florian HENRY
73192b78e9 FIX : better fetchAll method into skeleton_class.class.php 2015-07-29 11:50:31 +02:00
Florian HENRY
938be9bae0 FIX : fetchAll method in skeleton.class.php 2015-07-28 11:38:01 +02:00
Florian HENRY
ab3e1631f4 FIX : php_build_class_from_table comma ending on insert 2015-07-28 11:20:00 +02:00
Laurent Destailleur
4179d7dd5d Prepare 3.8 2015-07-19 15:50:53 +02:00
aspangaro
5ce419922d Fix: #3253 #3252 #3251 Remove print_r 2015-07-17 05:22:29 +02:00
Florian HENRY
bfcce0d36d fix syntax 2015-07-13 14:34:51 +02:00
Florian HENRY
242a906e40 fix syntax 2015-07-13 14:33:25 +02:00
Florian HENRY
7ba831bf84 FIX : #3192 2015-07-13 14:24:37 +02:00
Laurent Destailleur
fd3d43da25 Comment 2015-07-12 18:19:04 +02:00
Laurent Destailleur
0b9ed9a25c Fix PSR2. We must not have spaces after ( 2015-07-10 09:37:05 +02:00
Marcos García de La Fuente
98344746cf Added missing scopes of modMyModule 2015-07-07 13:08:17 +02:00
Raphaël Doursenaud
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
Laurent Destailleur
f320310304 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-03 16:24:17 +02:00
Laurent Destailleur
22bac55d32 Push partial lang 2015-07-03 16:23:56 +02:00
Laurent Destailleur
5db5a8a1fa No need of option all. Reference is now transifex. 2015-07-03 13:48:54 +02:00
Laurent Destailleur
b766f99acc Uniformize look. 
Make code to manage link "Now" on calendar more generic.
 2015-06-30 21:50:24 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
8df56511be NEW Enhance prototype, project list and proposal list with new hook to 
have an external module able to add more fields.
 2015-06-16 19:36:44 +02:00
Laurent Destailleur
6d064e8b9b NEW Add exemple of setup for multitail to render dolibarr log files 2015-06-14 17:01:44 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
77dafcbc3b Merge pull request #2945 from GPCsolutions/skeleton 
Qual: PHP5 OOP, commented and typehinted class template
 2015-06-05 16:15:03 +02:00
Laurent Destailleur
c4dd060858 Disable PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore 
rule
 2015-06-05 15:52:18 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
Raphaël Doursenaud
aa9f0965c0 Qual: PHP5 OOP, commented and typehinted class template 2015-06-03 17:31:42 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile. 
Add field fifo and lifo into product table.
 2015-05-30 23:56:42 +02:00
Laurent Destailleur
0ef5fe24a3 Start ansible example to deplay a dolibarr instance on a linux server 2015-05-19 14:31:26 +02:00
Laurent Destailleur
afaed832b1 Start ansible example to deplay a dolibarr instance on a linux server 2015-05-19 14:14:17 +02:00
Laurent Destailleur
851007f1a8 Prepare database to manage recurring events 2015-05-17 20:12:49 +02:00
Laurent Destailleur
60863d5d9d Enhance tool to report duplicate and not used language keys. 2015-05-15 02:28:42 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest 
Add new core module : REST API
 2015-05-12 19:39:37 +02:00
Laurent Destailleur
3a8cf17f3c NEW Can edit list of prospect status for customers/prospects. Add a new 
entry into dictionary table to manage list fo status.
Removed deprecated files.
 2015-05-06 23:13:07 +02:00
Laurent Destailleur
45f36514ec Add ansible example tools 2015-05-06 16:31:40 +02:00
jfefe
24bf614061 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7 Fix PHPCS 2015-05-06 00:55:42 +02:00
jfefe
fd077db1b7 NEW : script to build API class from existing class 2015-05-05 12:42:56 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
jfefe
a732b4d69b Missing value in PHPDoc tag for specify url method (in skeleton file) 2015-05-04 02:29:24 +02:00
jfefe
0003a14470 Update skeleton API class 2015-05-04 00:35:09 +02:00
jfefe
5fa5b51d2b Add API class skeleton for developers. 2015-05-03 20:15:06 +02:00
Laurent Destailleur
2f070b0e1b Fix data to match spanish current setup 2015-04-26 17:56:41 +02:00
Laurent Destailleur
24aea45da7 Fix also xml file of CRLF 2015-04-26 16:14:03 +02:00
Juanjo Menent
f7ab53be8e Fix test for es. Dumps 3.5 et 3.6 2015-04-22 23:40:43 +02:00
Juanjo Menent
e2635f66f5 Fix test for es 2015-04-22 22:10:50 +02:00
Laurent Destailleur
560fcb1b24 Remove external module 2015-04-19 15:27:30 +02:00
Laurent Destailleur
111b54d82c Fix phpcs 2015-04-19 03:02:49 +02:00
Tommaso Basilici
38cfbe4897 issue #2584 - added a counter 2015-04-18 22:37:23 +02:00
Tommaso Basilici
7cec7879e4 issue #2584 - output on a table + search for unused strings 2015-04-18 22:18:46 +02:00
Tommaso Basilici
82a269f233 issue #2584 - also finds duplicates on same file 2015-04-18 15:26:18 +02:00
Tommaso Basilici
25eeff4f19 first commit to fix issue #2584 - checks for duplicate lang strings across all en_US lang files 2015-04-18 15:12:06 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
 2015-04-02 13:57:20 +02:00
Laurent Destailleur
c62687d198 Comment 2015-04-02 12:55:00 +02:00
Laurent Destailleur
849b94b087 Fix cd not required 2015-04-02 12:49:11 +02:00
Laurent Destailleur
882baa55be Deprecated test 2015-04-02 11:53:47 +02:00
frederic34
3c2499f9a2 Remove logo in initdata for admin user 2015-04-01 10:10:39 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Florian HENRY
5617fb14b2 fix skeletton 2015-03-23 09:52:05 +01:00
Laurent Destailleur
aa5ffa0bf2 phpcs 2015-03-22 14:23:49 +01:00
Florian HENRY
058042d09d NEW : update skeleton and class builder 2015-03-18 17:52:17 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Laurent Destailleur
0ef2369399 Enhance tools to make transifex sync 2015-03-14 02:37:18 +01:00
Laurent Destailleur
a8e7d90ea3 Sync transifex 2015-03-13 22:02:53 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-03-13 17:46:31 +01:00
Laurent Destailleur
927925f4fd Can also sync alternatives languages from transifex now. 2015-03-13 17:42:50 +01:00
Laurent Destailleur
5cc48c7c78 Prepare cleaning tools for release. 2015-03-13 16:20:42 +01:00
Laurent Destailleur
56e77382f3 Merge 2015-03-04 20:43:54 +01:00
Laurent Destailleur
e667c3e916 Fix error management 2015-03-03 13:29:16 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Laurent Destailleur
ba98f6f94a Fix: Bad management of error 2015-03-02 01:05:12 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
 2015-02-16 20:59:04 +01:00
Laurent Destailleur
3cf4b80baa Fix missing test of action when using canvas 2015-02-16 02:02:11 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +01:00
Laurent Destailleur
bd4b401281 New: Introduce "_deprecated" keyword into module version when module has 
been superseed by another one.
 2015-02-14 15:10:06 +01:00
Laurent Destailleur
46b1e213b9 Sync from transifex 2015-02-13 21:26:43 +01:00
Laurent Destailleur
fd206dbb55 Fix ruleset.xml 2015-02-11 14:28:20 +01:00
Laurent Destailleur
f124079817 Fix ruleset 2015-02-10 21:49:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
Laurent Destailleur
820fc3dbc9 Merge pull request #2276 from aspangaro/3.7 
Correct link & typo
 2015-01-25 18:13:29 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
Laurent Destailleur
04afe935a5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6 Fixed travis errors 2015-01-22 21:46:22 +01:00
aspangaro
e9e552533f Correct link 2015-01-22 21:13:08 +01:00
Laurent Destailleur
5c007e53be Update sample examples 2015-01-22 18:35:02 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
38b51c0a14 Prepare 3.7 release 2014-12-21 21:07:31 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
5bcb195c15 Update codesniffer to remove travis errors. 2014-12-20 00:14:53 +01:00
Laurent Destailleur
d8838f9438 Update codesniffer to remove travis errors. 2014-12-20 00:11:43 +01:00
Laurent Destailleur
11368e48fe Update codesniffer to remove travis errors. 2014-12-20 00:11:12 +01:00
Laurent Destailleur
78ef12cc0d Merge remote-tracking branch 'origin/3.7' into develop 2014-12-19 19:12:05 +01:00
Laurent Destailleur
748b076d61 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-19 19:11:06 +01:00
Laurent Destailleur
789d588fde Update codesniffer to remove travis errors. 2014-12-19 19:10:41 +01:00
Laurent Destailleur
0bb431c4d0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-19 19:03:05 +01:00
Laurent Destailleur
47cab90336 Update codesniffer to remove travis errors. 2014-12-19 19:01:29 +01:00
Laurent Destailleur
c120e7b3df Clean deprecated files. 
Add utility tool
 2014-12-19 16:10:11 +01:00
Laurent Destailleur
c163223957 Moved vagrant dir into obsolete repo 2014-12-19 12:39:20 +01:00
Laurent Destailleur
c3ac607e4f Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-18 23:56:40 +01:00
Laurent Destailleur
c571013fc9 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-18 23:55:07 +01:00
Laurent Destailleur
3debf56c68 Update phpcs 2014-12-18 23:54:39 +01:00
Laurent Destailleur
b1c4d32fbf Update phpcs file 2014-12-18 23:53:17 +01:00
Laurent Destailleur
ad515ef5e5 Exclude test 2014-12-18 23:49:07 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
cf641194a1 Fix: CRLF 2014-12-09 00:02:43 +01:00
Laurent Destailleur
72c3954f36 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
 2014-12-05 21:12:35 +01:00
Laurent Destailleur
df066c3741 Fix: PHPCS 2014-12-05 20:34:36 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
9b5a03fa82 Fix: PHPCS 2014-12-05 20:08:37 +01:00
Laurent Destailleur
46f9ab15da Fixed: PHPCS 2014-12-05 19:26:21 +01:00
Laurent Destailleur
5755a046c5 Fix: PHPCS 2014-12-05 19:25:08 +01:00
Laurent Destailleur
4ad93cd069 Fix: PHPCS 2014-12-05 17:49:27 +01:00
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
c36d362248 Fix: PHPCS 2.0 2014-12-05 17:38:34 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Laurent Destailleur
86e04cb62f Enhance tool to fix images 2014-11-30 15:40:28 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Laurent Destailleur
d39dbe66c8 Fix: Removed duplicate entrie into language files 
Renamed tool so all script to run before release start with "fix".
 2014-11-30 14:51:57 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Raphaël Doursenaud
7a7097a106 Work around bug #1643 2014-11-17 14:58:48 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Juanjo Menent
d9b27fc280 Qual: Skeleton class updated by using table_element instead "mytable" 
and __METHOD__ for syslog
 2014-11-11 21:43:56 +01:00
Laurent Destailleur
7da4edda01 Incresae value for warning 2014-11-10 09:48:26 +01:00
Laurent Destailleur
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Raphaël Doursenaud
b9954f5b2b PHP 5.6 compatibility 
$HTTP_RAW_POST_DATA is now DEPRECATED
Replaced all usages by the recommended file_get_contents("php://input")
 2014-09-16 21:21:34 +02:00
Laurent Destailleur
be3f458754 Fix: Pb with pgsql 2014-09-03 11:30:13 +02:00
Laurent Destailleur
911cccba80 Disable rule FunctionDoubleUnderscore that seems to be bugged. 2014-08-28 12:31:57 +02:00
Raphaël Doursenaud
d4414bc0f2 Added dev script for optimizing images 2014-08-19 12:38:50 +02:00
Laurent Destailleur
b6ff6527bc Enhance skeleton 2014-08-17 18:37:33 +02:00
Laurent Destailleur
2eb01cfbf9 Squelette plus complet. 2014-08-15 21:18:56 +02:00
Laurent Destailleur
c79fc516d3 Maj squelette 2014-08-14 17:27:28 +02:00
Laurent Destailleur
5a0c66b9ad Qual: Use getNomUrl for project into list of timesheet. 2014-08-14 13:29:24 +02:00
Laurent Destailleur
454cb1cbf8 Enhance skeleton 
Add code_iso3 into array
 2014-08-13 19:19:36 +02:00
Laurent Destailleur
e52d8a609f Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 11:01:43 +02:00
Laurent Destailleur
74d9ada517 Fix: Clean init data 2014-08-06 10:59:09 +02:00
Laurent Destailleur
544e75c2a1 Fix: Clean init data 2014-08-06 10:57:35 +02:00
Laurent Destailleur
9c6222a776 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 10:54:31 +02:00
Laurent Destailleur
338c4543fc Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:52:57 +02:00
Laurent Destailleur
098c5febd5 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:51:16 +02:00
Laurent Destailleur
272c438431 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:49:22 +02:00
Laurent Destailleur
800ded40d3 Fix: Removed table of external modules 2014-08-06 10:40:26 +02:00
Laurent Destailleur
d8fe7b904e Fix: Removed table of external modules 2014-08-06 10:38:14 +02:00
Laurent Destailleur
35d2e4f84c Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 10:30:58 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	test/phpunit/SqlTest.php
 2014-08-06 10:28:37 +02:00
Laurent Destailleur
a430534768 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:22:34 +02:00
Laurent Destailleur
65b7f3d744 Fix: Clean data init 2014-08-06 10:18:32 +02:00
Laurent Destailleur
8c25fdfd2c Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:16:25 +02:00
Laurent Destailleur
86f4b874eb Fix: Clean data init 2014-08-06 10:15:32 +02:00
Laurent Destailleur
7f0baa3d65 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:12:47 +02:00
Laurent Destailleur
bb201010e5 Fix: Clean data init 2014-08-06 10:12:02 +02:00
Laurent Destailleur
86c6709d02 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:10:13 +02:00
Laurent Destailleur
0e2de54660 Fix: Clean data init 2014-08-06 10:02:02 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Laurent Destailleur
bdc9d5b463 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-01 00:34:24 +02:00
Laurent Destailleur
b1e3ac5181 Track we renamed getmypid into dol_getmypid. 2014-08-01 00:29:13 +02:00
frederic34
6645b8a454 Cannot redeclare getmypid() 2014-07-31 10:21:47 +02:00
Marcos García de La Fuente
0b31bfc067 Updated Vagrant Puphpet box 2014-07-29 11:23:13 +02:00
Laurent Destailleur
9ef3683acc I grouped rules by Standard (PEAR, Generic, Zend, ...) 
If a standard bring a rule that is duplicate than the other, we must
keep it commented saying duplicate with.
So at any time we know which rule we match for each standard.
 2014-07-26 15:07:30 +02:00
Laurent Destailleur
9eb54ffb4b Fix: Bad merge 2014-07-20 16:14:25 +02:00
Laurent Destailleur
5572364d2b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-07-20 16:09:42 +02:00
Laurent Destailleur
85ccb094b4 Fix: More complete exclusion list 2014-07-20 15:54:37 +02:00
Laurent Destailleur
0452c2d68e Qual: Enhance PHPCS sheet. 2014-07-20 15:39:38 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag 
Fix: Solve a lot of checkstyle errors.
 2014-07-20 15:27:38 +02:00
Marcos García de La Fuente
43f6d3deaf Moved dolibarr source to another folder of /var/www so that external libraries get separated from dolibarr core 2014-07-12 15:51:39 +02:00
Marcos García de La Fuente
0c8765bfe3 Updated vagrant box 2014-07-12 14:56:22 +02:00
Laurent Destailleur
aaa2d75dc3 Disable test on Zend.Files.ClosingTag for the moment to try to restore a 
green status with travis.
 2014-07-08 01:04:16 +02:00
Laurent Destailleur
07ff74b069 Revert "Update ruleset.xml" 
This reverts commit 9cca9f352f.
 2014-07-08 00:19:00 +02:00
Laurent Destailleur
a2bc97210b Merge pull request #1721 from frederic34/patch-6 
Update ruleset.xml
 2014-07-07 21:27:09 +02:00
Laurent Destailleur
8b9755e7c2 Merge pull request #1717 from frederic34/patch-5 
Update ruleset.xml
 2014-07-07 21:24:17 +02:00
Laurent Destailleur
9eaa096c79 Merge pull request #1716 from frederic34/patch-4 
Update ruleset.xml
 2014-07-07 21:24:00 +02:00
frederic34
9cca9f352f Update ruleset.xml 
PHP code MUST NOT contain any character before the opening tag
 2014-07-07 21:11:03 +02:00
Laurent Destailleur
8ed0798939 Use id of module + delta 2014-07-06 20:53:38 +02:00
frederic34
f7586cdbfa Update ruleset.xml 
PHP code MUST use only UTF-8 without BOM.
 2014-07-06 16:43:16 +02:00
frederic34
2080f58c2c Update ruleset.xml 
The closing ?> tag MUST be omitted from files containing only PHP.
 2014-07-06 15:49:24 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
KreizIT
1e5c35093b Review trigger for user module 2014-07-03 14:01:01 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Marcos García de La Fuente
4b3be7bc9a Removed support to PHPmyAdmin 2014-06-23 12:30:24 +02:00
Marcos García de La Fuente
69ddac78cb Updated .gitignore and README with new versions 2014-06-23 12:01:04 +02:00
Marcos García de La Fuente
e6da3d94ba Updated PuPHPet vagrant box to latest version 2014-06-23 11:28:59 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
39c1064261 Fix: Process only .lang files. 2014-05-30 18:30:24 +02:00
Raphaël Doursenaud
020c662537 Added a script to automatically remove PHP closing tag 2014-05-26 13:54:03 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
349d6177d1 Clean more secondary languages 
Add information of file and line number when a duplicate translation key
is found.
 2014-05-22 14:35:53 +02:00
Laurent Destailleur
e9ab84074e Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 14:33:42 +02:00
Laurent Destailleur
4e00d4467c Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 12:41:43 +02:00
Laurent Destailleur
4f52f22735 Fix: Run script from correct dir 2014-05-18 12:06:09 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Florian HENRY
ff454130de add tobatch into into data product 2014-05-14 12:58:20 +02:00
Florian HENRY
100628622a fix insert data from initdata3.6 form url column into llx_product 2014-05-14 12:53:06 +02:00
Florian HENRY
9cd8b3a2b7 Add url column into llx_product into initdata for 3.6 (else phpunit is 
not happy)
 2014-05-14 11:49:54 +02:00
Laurent Destailleur
8985d60c5b Update doc 2014-05-08 20:15:44 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
7f9f7aa84e Fixed problems with shared folders in Mac. Won't affect other OS 2014-05-01 13:21:09 +02:00
Marcos García de La Fuente
6037777e52 Ignored auto generated RSA keys 2014-05-01 13:20:38 +02:00
Marcos García de La Fuente
80bd018815 Updated Puphpet vagrant box to latest version 2014-05-01 12:32:23 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
dc6a09f746 Doc 2014-04-07 00:00:30 +02:00
Laurent Destailleur
6a916a4ce9 Add sq_AL (albanian) language 2014-04-06 23:29:07 +02:00
Laurent Destailleur
90f5f0823f Prepare 3.5.2 2014-04-05 16:32:25 +02:00
Laurent Destailleur
8405ec4816 Syntax error 2014-04-05 14:10:18 +02:00
Raphaël Doursenaud
800067a478 Added a dev script to help identify duplicate translation keys in language files 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
09b6ccbe58 Qual: generic shebang 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
c5d8892d89 Added a dev script to recursively deduplicate file lines on a per file basis 
This script is useful to deduplicate language files
 2014-03-27 12:04:03 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases. 
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
 2014-03-21 16:22:41 +01:00
Laurent Destailleur
6eac7e1bdc Fix: CRLF 2014-03-15 23:17:46 +01:00
Laurent Destailleur
1396fb1dbe Merge pull request #1448 from GPCsolutions/tcpdf-monotype 
TCPDF: Replaced missing courier monotype font by provided freemono
 2014-03-06 18:23:22 +01:00
Raphaël Doursenaud
2f150a8927 Updated dolibarr_changes 2014-03-06 18:15:50 +01:00
Laurent Destailleur
b2d9fac993 More complete sql file 2014-03-03 19:39:44 +01:00
Laurent Destailleur
c3bc0cc8d1 Add demo sql file for 3.6 2014-03-02 16:57:37 +01:00
Laurent Destailleur
473b0f73be New: build_class_from_table can work with a distant database server. 2014-02-26 10:42:45 +01:00
Marcos García de La Fuente
7aadeb0a98 Updated vagrant README 2014-02-24 21:46:41 +01:00
Marcos García de La Fuente
fb8ec21f72 Updated puphpet vagrant box 2014-02-24 21:42:40 +01:00
Marcos García de La Fuente
cb90181719 Updated doc and removed incompatible .vimrc file 2014-02-16 02:16:17 +01:00
Marcos García de La Fuente
e562930cc2 Corrected Vagrant box URL 2014-02-16 01:00:18 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
f6f6022b7a Add eu_ES language. 2014-02-08 03:44:53 +01:00
Laurent Destailleur
e22e4fc4d7 Sync from transifex 2014-02-05 23:10:44 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
8642e2027c Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal 
vulnerability
 2014-01-20 02:10:16 +01:00
Marcos García de La Fuente
5f3d2aea51 Opensurvey polls tab cards can now be extended from external modules 2014-01-02 16:32:48 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
 2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2 Fix: Missing some languages into the transifex sync script. 
Trans: Sync language files from transifex.
 2013-12-31 12:03:37 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
2e0fc364bd Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb Fix: Removed analytics tags 2013-12-30 12:35:32 +01:00
Marcos García de La Fuente
098e6f4560 Added new tab types in modMyModule.class.php 2013-12-25 03:17:16 +01:00
Laurent Destailleur
3f89f27a0c Merge pull request #1329 from GPCsolutions/vagrant 
Vagrant
 2013-11-29 06:38:48 -08:00
Raphaël Doursenaud
b391de1b23 Added initdata info to vagrant readme 2013-11-29 15:27:04 +01:00
Raphaël Doursenaud
507e648adb Use latest release initdata 2013-11-29 15:24:29 +01:00
Raphaël Doursenaud
0f34f81dc7 Moved VM vhost to dev.dolibarr.org 
This helps avoid Google Chrome doing a search instead of an HTTP request
 2013-11-29 15:22:31 +01:00
Raphaël Doursenaud
cb210650de Added more information about the dolibarrdev vagrant box 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
694eeeb2bb Fixed vagrant shared folder permissions 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
9bba60ebee Added basic readme about Vagrant 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
0f9c616890 Added vagrant development box 2013-11-29 15:22:30 +01:00
Raphaël Doursenaud
a7afe07538 Scripts should be executable 2013-11-28 15:17:58 +01:00
Raphaël Doursenaud
9ae9a02b95 SQL files shouldn't be executable 2013-11-28 15:17:39 +01:00
Laurent Destailleur
c3af8b6b29 Sync from transifex 2013-11-27 14:59:02 +01:00
Laurent Destailleur
b75137d4ff Fix files that should not mix tab and spaces indent. 2013-11-24 13:02:20 +01:00
Raphaël Doursenaud
83f99b5ba6 Use LF instead of CRLF 2013-11-19 14:36:55 +01:00
Laurent Destailleur
33d55faf6b Fix: error into dump file 2013-11-16 15:42:05 +01:00
Laurent Destailleur
c5230ea2ff Fix: option --skip on by default 2013-11-15 23:39:44 +01:00
Peter Fontaine
3d7d8c7d5d add tests 
add default_rib column in mysqldump
 2013-11-14 10:48:36 +01:00
Laurent Destailleur
27fede8848 Update demo file 2013-11-07 02:28:32 +01:00
Laurent Destailleur
e88faf0f0f Update sql 2013-11-07 00:46:12 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Laurent Destailleur
19ae524ad9 Fix: Local for SeparatorDecimal and SeparatorThousand were lost during 
transifex synchro.
 2013-10-25 12:27:13 +02:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
0cb9ef37c0 Add option into usage 2013-10-23 11:22:56 +02:00
Laurent Destailleur
5735c9252a Fix: Files must be saved with utf8 2013-10-23 10:49:44 +02:00
Laurent Destailleur
7eaffc186b Update demo with new structure 2013-10-22 00:36:53 +02:00
Laurent Destailleur
d12240e087 Add doc 2013-10-10 22:37:07 +02:00
Laurent Destailleur
6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
 2013-09-11 23:12:47 +02:00
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
 2013-09-11 21:54:57 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
943f8108ab Fix a rule 2013-09-10 12:11:08 +02:00
Laurent Destailleur
376a7e2e3c Remove checkstyle outpout that is too verbose. 
USe instead option -s
Disable a rule
 2013-09-10 11:59:15 +02:00
Laurent Destailleur
e2110e620c Fix: syntax error in ruleset.xml 2013-09-10 02:32:39 +02:00
Laurent Destailleur
2f0ad6a22c Fix: syntax error in ruleset.xml 2013-09-10 02:32:33 +02:00
Laurent Destailleur
c351ac5bbd Fix: syntax error in ruleset.xml 2013-09-10 02:32:24 +02:00
Laurent Destailleur
11992dca9f Fix init data sql 2013-09-09 20:37:44 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00