Commit Graph

1649 Commits

Author SHA1 Message Date
Laurent Destailleur
9a82cc3261 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493 Fix missing translation 2018-08-18 02:55:22 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different 2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
9786743795
test phpcs v3 2018-08-09 10:49:17 +02:00
Frédéric FRANCE
b90d125fda
trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +02:00
Frédéric FRANCE
39f5641fed
trim trailing 2018-07-26 17:33:36 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
aaf4f06686
test include 2018-07-26 11:10:48 +02:00
Laurent Destailleur
988b6a49d2 Fix warning php 7.3 2018-07-13 18:40:54 +02:00
Laurent Destailleur
2e891b5694 Trans 2018-06-06 11:20:35 +02:00
Frédéric FRANCE
03bba4daf0
do not test *.min.css with phpcs 2018-05-30 13:30:14 +02:00
Frédéric FRANCE
8bfe70899f
phpcs 2018-05-27 18:52:31 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Laurent Destailleur
1f775c907d Fix translation of % column in gantt view 2018-05-04 11:01:22 +02:00
Laurent Destailleur
c35a190f1d update some tools 2018-04-27 13:31:11 +02:00
Laurent Destailleur
b049cf194d Fix PSR2 2018-04-22 20:17:27 +02:00
Laurent Destailleur
7f8f55a54b Show version in travis settings 2018-04-22 18:12:19 +02:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
Laurent Destailleur
7db23385f5 Hide pass 2018-03-15 19:49:29 +01:00
Laurent Destailleur
e68612fa09 Fix initdemo must not copy index.html files 2018-02-24 12:06:26 +01:00
Laurent Destailleur
0296661864 Complete the demo profile 2018-01-19 12:39:47 +01:00
Laurent Destailleur
446c28ce2a Init demo for v7 2018-01-19 12:35:38 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Laurent Destailleur
ca8ae3c723 Fix option MAIN_USE_JQUERY_JEDITABLE 2017-12-20 13:17:21 +01:00
Laurent Destailleur
12d91d7444 Fix missing messages in error report.
Fix test on non empty array
2017-12-19 18:26:27 +01:00
Laurent Destailleur
394eeb3cd9 Fix rendering MD files of images by adding a css 2017-12-16 15:11:40 +01:00
Laurent Destailleur
d9c416ee17 Complete example 2017-11-29 17:51:08 +01:00
Laurent Destailleur
f9aaddb658 Add spec for french ecompte 2017-11-29 14:08:14 +01:00
Laurent Destailleur
7d3325c087 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/user/class/api_users.class.php
2017-11-25 13:17:38 +01:00
Laurent Destailleur
61798d1af0 FIX list of module not complete when module mb_strlen not available
Conflicts:
	dev/dolibarr_changes.txt
2017-11-25 02:34:24 +01:00
Laurent Destailleur
bdecef56f9 FIX list of module not complete when module mb_strlen not available 2017-11-25 02:32:25 +01:00
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
f33b5067ad Upgrade branch 3.0 of RESTLER (still 3.0.0 RC6)
This upgrade Swagger from 1.2 to 2.0
2017-11-17 12:55:27 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
05683bbf61 Code comment 2017-11-13 11:41:37 +01:00
Laurent Destailleur
a2daef3450 Update doc 2017-11-09 16:13:39 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Laurent Destailleur
0d09e1d223 Enhance purge 2017-10-29 20:12:02 +01:00
Laurent Destailleur
bb5bfabd7d Enhance the script purge-data.php to purge remote database 2017-10-29 20:08:09 +01:00
Laurent Destailleur
a818422302 Update jsgantt to 1.7.5.4 2017-10-18 21:24:17 +02:00
Laurent Destailleur
536e1a95c7 Add SEPA file example 2017-10-17 14:20:39 +02:00
Laurent Destailleur
f853dbc152 Add spec for SEPA 2017-10-14 02:55:07 +02:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
c3ada19892 Fix demo backup 2017-10-13 01:27:49 +02:00
Laurent Destailleur
f89676126e Update translation tools 2017-10-07 20:11:35 +02:00
Laurent Destailleur
67c571f952 Increase cyclomatic complexity threshold 2017-10-06 01:59:26 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
75e7281054 Add resource for NACE 2017-10-02 12:41:50 +02:00
Regis Houssin
e65b21a3bf Fix: change the parameter value of dol_getIdFromCode 2017-10-02 11:59:17 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Ahmad M. Zawawi
5fd7cdff5c Fix example comment typo 2017-09-16 10:53:16 +03:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
4bbd42123e Fix mysqldump (missing fields) 2017-09-06 22:02:44 +02:00
Regis Houssin
8e8f94df11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
52a2073152 Add demo file for 6.0 2017-08-27 15:51:44 +02:00
Laurent Destailleur
54afb2f1af Add demo file for 6.0 2017-08-27 15:48:26 +02:00
Regis Houssin
2efb86b5d8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
9e6666e511 Fix translation keys for taxes 2017-07-22 16:40:19 +02:00
Regis Houssin
26df1389f4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Regis Houssin
c8bd11660d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-18 15:23:43 +02:00
Laurent Destailleur
5f32c3d34a Work on new india vat system 2017-07-18 12:49:42 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
9fc17d8988 Translation 2017-07-09 13:43:23 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
Regis Houssin
544d051fe3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
b331176bf7 Fix bad data 2017-06-19 02:58:09 +02:00
Laurent Destailleur
52eeeebac9 Fix bad data in sql dump 2017-06-19 02:57:49 +02:00
Regis Houssin
a0299042e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
71c0be20b9 Change data structure for bookkeeping v6 2017-06-15 10:30:32 +02:00
Regis Houssin
0e8f36dc92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00
Laurent Destailleur
ee8bc24348 Merge pull request #6920 from inoveaconseil/patch-3
Print the value of fields
2017-06-08 10:59:51 +02:00
Laurent Destailleur
58f315e8d1 Merge pull request #6922 from inoveaconseil/patch-5
Fix bug to display value
2017-06-03 00:41:36 +02:00
Inovea Conseil
40dd6fc61c Fix bug to display value
Fix bug to display the values in the future card.php
2017-06-01 11:22:08 +02:00
Inovea Conseil
fa3cd267f4 Fix bug of prepare_head of card
Delete the call of commande_prepare_head function because do not use in skeleton
2017-06-01 10:51:30 +02:00
Inovea Conseil
ab99c178e1 Print the value of fields
Add a loop for printing the value of fields
2017-06-01 09:04:20 +02:00
Laurent Destailleur
c4f09b8894 Work on modulebuilder 2017-05-28 14:43:17 +02:00
Inovea Conseil
035cae656f Fix bug in insert method
Missing the last comma in the insert method
2017-05-19 22:14:34 +02:00
Laurent Destailleur
0d11fce834 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-12 15:45:30 +02:00
Laurent Destailleur
80b0d91154 More complete demo 2017-05-12 12:12:04 +02:00
Laurent Destailleur
3e0fcf5ec2 Fix label "total for this page" on last page. 2017-05-10 11:57:59 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
4012aeff90 Fix translation 2017-03-25 18:35:17 +01:00
Laurent Destailleur
8cd0956b30 Code comment 2017-03-03 13:28:18 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
230bb09c1a Prepare 5.0 2017-02-21 16:59:21 +01:00
Laurent Destailleur
ebe625aa16 Fix debug direct debit module 2017-02-21 13:16:28 +01:00
Laurent Destailleur
63876a1b91 Prepare 5.0 release 2017-02-21 12:09:55 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Laurent Destailleur
6c40110613 Sync transifex 2017-02-21 10:26:11 +01:00
Laurent Destailleur
c3d78bf1b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/update.php
2017-02-16 22:09:37 +01:00
Laurent Destailleur
ad890561c4 Prepare release 5.0 2017-02-16 02:00:34 +01:00
Laurent Destailleur
1a3b9fada5 Som fixes on generator of samples 2017-02-16 01:50:02 +01:00
De Coninck Laurent
fa527ff4eb fix the card page generator 2017-02-09 13:10:32 +01:00
Laurent Destailleur
4cec071af5 Add tms field 2017-01-31 14:00:53 +01:00
Laurent Destailleur
70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:24:55 +01:00
Laurent Destailleur
4839d06fc3 Fix log 2017-01-26 12:48:32 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
6ab9ba3284 Fix management of alternative language for Greek (el_CY) 2017-01-21 21:52:42 +01:00
Laurent Destailleur
160f8c3085 Add translation comparison doc 2017-01-17 11:11:32 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
Laurent Destailleur
c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
94f14f529b Fix pb with double quote 2017-01-11 22:02:08 +01:00
Laurent Destailleur
fd008f88b1 Add github tools 2017-01-09 10:21:59 +01:00
Laurent Destailleur
febd23fe41 Clean dead code 2017-01-03 11:22:03 +01:00
Laurent Destailleur
b5c815367c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-26 15:44:31 +01:00
Laurent Destailleur
b777ec79f2 Fix contextpage implementation into skeleton 2016-12-23 10:38:27 +01:00
Laurent Destailleur
f9d29bbe25 Complete sample of setup files 2016-12-23 01:25:40 +01:00
Laurent Destailleur
cfde9e2ec5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-22 18:04:13 +01:00
Laurent Destailleur
dcb14db10d Add .pml files into fixdosfiles 2016-12-22 18:03:34 +01:00
Laurent Destailleur
e26cb0f238 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-12 13:00:20 +01:00
Laurent Destailleur
7077b4931c Add dump v5 2016-12-12 11:57:50 +01:00
Laurent Destailleur
3396dfc7f6 NEW Index upload files into database. 2016-12-08 22:12:45 +01:00
Laurent Destailleur
d23604701c Fix responsive 2016-12-07 15:00:20 +01:00
Laurent Destailleur
f9ef6f52a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/skeletons/skeleton_list.php
2016-12-07 12:23:43 +01:00
jfefe
64f76d8cab Fix : bad function name 2016-12-02 17:02:49 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
bgenere
febb4d7b60 Fixed issue with extrafields join for search. Main table alias is t not
u.
2016-11-21 10:15:35 +01:00
Laurent Destailleur
9b88ae145b Fix mass action when using no javascript 2016-11-17 19:04:10 +01:00
Laurent Destailleur
35d80aa209 Miscellaneous fixes 2016-11-12 12:40:06 +01:00
Laurent Destailleur
da387db166 NEW Error code of each email sent is visible in list of email targets 2016-11-11 14:03:57 +01:00
Laurent Destailleur
7fa9692458 Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE. 2016-11-02 12:48:50 +01:00
Laurent Destailleur
ef03f59e50 Uniformize code 2016-11-02 12:16:46 +01:00
Laurent Destailleur
aec0e79653 Normalize constant name. 2016-10-29 21:47:10 +02:00
Laurent Destailleur
6938b05219 Mutualize code to show files generated for mass actions 2016-10-28 12:00:30 +02:00
Laurent Destailleur
e1eb61d3a2 Fix travis on notooltip 2016-10-26 11:39:54 +02:00
Laurent Destailleur
854e75513b Fix bad alias 2016-10-25 21:44:10 +02:00
Laurent Destailleur
9fd692d846 Fix phpcs 2016-10-25 19:28:58 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Laurent Destailleur
8ab31188ab Merge pull request #5891 from BeltranBot/patch-1
Fix: misspelling
2016-10-24 01:09:53 +02:00
Laurent Destailleur
618ac420e4 Better skeleton 2016-10-21 10:56:25 +02:00
BeltranBot
46c0aa3f03 misspelling fix
fixing a misspelling
2016-10-18 11:32:35 -05:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
4dfdf29a55 FIX #5742 error on project list if an extra field separator is added. 2016-10-01 18:00:17 +02:00
Laurent Destailleur
057e107d29 Fix on skeleton 2016-09-30 23:44:55 +02:00
Laurent Destailleur
dcb18cd637 Clean and reorganize dev tools 2016-09-27 19:43:34 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Raphaël Doursenaud
72d9f3cd5f
Fixed typo 2016-09-08 16:40:11 +02:00
Raphaël Doursenaud
f97f011cd3
Added missing properties in modules class.
Enhanced modules class documentation.
2016-09-08 16:37:48 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
Laurent Destailleur
2262c1c7dd Fix code generator 2016-08-08 21:58:47 +02:00
Laurent Destailleur
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
ee7023422a Update dump 2016-07-31 23:19:01 +02:00
Laurent Destailleur
20a2282efc Updated screenshots 2016-07-31 16:24:32 +02:00
Laurent Destailleur
e3df4b81f8 Update demo 4.0 2016-07-30 21:13:16 +02:00
Laurent Destailleur
5aa5c5259d demo is in mode stable 2016-07-30 20:39:25 +02:00
Laurent Destailleur
9191692bb2 More files for demo data 2016-07-30 20:33:01 +02:00
Laurent Destailleur
654ac318d4 Prepare dump for 4.0 demo 2016-07-30 20:26:05 +02:00
Laurent Destailleur
5d81db9693 Update skeleton with mass action code 2016-07-30 20:05:54 +02:00
Laurent Destailleur
a87c2f9579 Fix several fixes on margin reports 2016-07-30 18:57:26 +02:00
Laurent Destailleur
246321cd8f Fix clean orphelins of leave request logs in repair tools
Fix date of supplier proposal missing.
2016-07-30 18:08:07 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank
tranfert for payements
2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
7678940e50 Fix refresh cache value of nb of files into a dir into ECM module 2016-07-30 15:51:27 +02:00
Laurent Destailleur
e3f0ab9109 Fix tag was not visible 2016-07-30 14:05:39 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
4d1885eb59 Fix: restore logout and logged translation key 2016-07-27 17:00:14 +02:00
florian HENRY
419dd3095b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353

Conflicts:
	htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
b085ce6916 Fix lost translation keys 2016-07-23 13:01:42 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
2c77a901b3 Fix to avoid removal of trnaslation key to keep 2016-07-18 12:55:44 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
2016-07-16 19:54:57 +02:00
Juanjo Menent
cd0849209c FIX Failed to open file 2016-07-15 19:44:45 +02:00
Juanjo Menent
88d12618ce NEW Do not use Functions Aliases 2016-07-15 17:10:13 +02:00
Juanjo Menent
8a022fb19d NEW Do not use Function Aliases 2016-07-15 16:58:26 +02:00
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
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