lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

56393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5ebbe02853 Fix missing trackid into parameters of hooks 2016-07-07 16:26:00 +02:00
Laurent Destailleur
56e374ff0d Fix remove warnings 2016-07-07 15:41:11 +02:00
Laurent Destailleur
24a798ed2f Fix restore translation for ModuleCompanyCode... 2016-07-07 14:13:33 +02:00
Regis Houssin
784880bbd1 Fix: wrong comment 2016-07-07 12:52:38 +02:00
Regis Houssin
785489dbcb Fix: changelog 2016-07-07 12:49:40 +02:00
Regis Houssin
961a37d724 Merge remote-tracking branch 'origin/develop' into develop_origin 2016-07-07 12:45:03 +02:00
Regis Houssin
08725003b9 Fix: add entity field in llx_societe_remise, useful when third-sharing 
is used with multicompany
 2016-07-07 12:43:02 +02:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when 
third-sharing is used with multicompany
 2016-07-07 12:26:30 +02:00
BENKE Charlie
8a5a5a9899 Add : new param accounting export 
We keep the old export format with no date
 2016-07-07 11:48:22 +02:00
Laurent Destailleur
3566c3fd6e Fix bad link 2016-07-07 11:31:07 +02:00
Laurent Destailleur
3c6c509358 Fix compatibility with old behaviour (direct open of card after a 
search)
 2016-07-07 10:26:40 +02:00
Sof
9b5bcc6dcd FIX: Missing semicolon 2016-07-07 10:25:17 +02:00
Laurent Destailleur
2af7a8c584 Transifex sync 2016-07-07 10:06:35 +02:00
Neil Orley
59d96fdc07 ut8_encode() removed from balance.php and listbyaccount.php 2016-07-07 09:52:59 +02:00
florian HENRY
96172a5910 better syntax 2016-07-07 09:49:27 +02:00
florian HENRY
240dcc78fb fix php warning introduce by 97eedb866b 
urlencode cannot deal with array
 2016-07-07 09:47:12 +02:00
florian HENRY
1957af52b1 fix syntax 2016-07-07 09:23:43 +02:00
florian HENRY
2d932066c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type 2016-07-07 09:17:39 +02:00
florian HENRY
8b985b6071 sdffds 2016-07-07 09:17:32 +02:00
florian HENRY
e8f9a558b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_ship_tag_mail 2016-07-07 09:08:47 +02:00
florian HENRY
ad7bece248 merge file 2016-07-07 09:08:03 +02:00
florian HENRY
45dbd337cb reset file with upstream 2016-07-07 09:07:12 +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
63ad970a27 Sync transifex 2016-07-07 04:26:22 +02:00
Laurent Destailleur
804159f3f3 Fix language files 2016-07-07 04:11:27 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
b2d4fb94d6 Fix wrapping of left menu for menu titles 2016-07-07 00:34:59 +02:00
Laurent Destailleur
e55ae1476a Fix innosetup install 2016-07-06 23:55:10 +02:00
Laurent Destailleur
d7bc30fc4e Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
Laurent Destailleur
16e3a3d294 Fix datadir not defined 
Fix can't use the cron script on cloud services since the admin user may
have different values.
 2016-07-06 22:49:08 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
Regis Houssin
4503659cba Fix: wrong multicompany filter 2016-07-06 16:50:10 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Laurent Destailleur
8505c5db09 Code comment 2016-07-06 13:26:49 +02:00
Laurent Destailleur
148f2e4c00 Merge pull request #5449 from fmarcet/3.8 
Fix: Don't load extrafields on orderstoinvoice
 2016-07-06 11:56:05 +02:00
Laurent Destailleur
b77edf9f32 Merge pull request #5448 from atm-maxime/fix_task_odt_model 
FIX task ODT company object not correctly retrieved
 2016-07-06 11:55:13 +02:00
Laurent Destailleur
840601a491 Merge pull request #5451 from grandoc/develop 
internationalization of code comment
 2016-07-06 11:53:37 +02:00
Laurent Destailleur
646e6f4996 Merge pull request #5454 from atm-alexis/FIX_develop_add_post_into_print_link 
FIX add POST key on print link
 2016-07-06 11:49:45 +02:00
Laurent Destailleur
759b265eeb Merge pull request #5447 from atm-florian/dev_fix5446 
FIX #5446 Extrafields select list filter on other select list do not work
 2016-07-06 11:46:21 +02:00
Laurent Destailleur
16c1816e7c Merge pull request #5445 from atm-florian/develop 
FIX hidden extrafield feature edit
 2016-07-06 11:35:19 +02:00
Laurent Destailleur
f39558ebb0 Fix ĉonf not defined 2016-07-06 11:24:51 +02:00
Laurent Destailleur
0af555126c Fix PHPCS 2016-07-06 11:23:32 +02:00
Laurent Destailleur
8e9a7cb629 Fix var not always defined 2016-07-06 11:20:09 +02:00
Laurent Destailleur
c360189d94 Code comment 2016-07-06 11:14:17 +02:00
Laurent Destailleur
8e19b235f1 Code comment 2016-07-06 11:06:49 +02:00
Laurent Destailleur
9249a7c736 Add entry to run stop/start doliwamp as admin 2016-07-06 11:05:23 +02:00
Laurent Destailleur
a2e26e6ba0 Upgrade apache and php for DoliWamp but not Mysql 2016-07-06 10:49:19 +02:00
Alexis Algoud
97eedb866b FIX add POST key on print link (avoid action in case of) 
in order to keep filter on list and other case
 2016-07-06 10:36:58 +02:00
Laurent Destailleur
da5228aaa9 Selection of fields ok for interventions 2016-07-06 10:28:34 +02:00