lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,811 Commits 43 Branches 150 Tags 886 MiB
ea5b8a409c
Commit Graph

51811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
04c5516483 Fix the format "dayall" does not exists. Instead add missing format 
"_locale" using correct language file.
 2016-01-02 11:51:40 +01:00
braito4
9b3533e753 FIX #4326 PHP7 Warning 2016-01-02 11:42:43 +01:00
Laurent Destailleur
865d93b19e Merge pull request #4324 from defrance/patch-93 
Add rfc and dayall format for extrafields date
 2016-01-02 11:39:42 +01:00
Laurent Destailleur
1a5dab11e0 Merge pull request #4323 from atm-ph/fix_3.8_trigger_addline_supplier_invoice 
FIX call trigger LINEBILL_SUPPLIER_CREATE
 2016-01-02 11:27:11 +01:00
Laurent Destailleur
273f3678bc Fix no ?> at end of php files 2016-01-02 00:32:22 +01:00
Laurent Destailleur
1ae4bef04b Fix conflict with the div #dialog used for popup cut and paste of 
address.
 2016-01-02 00:27:14 +01:00
Laurent Destailleur
a7b2f000d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-01 23:44:35 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
BENKE Charlie
dbb8e49654 Update commondocgenerator.class.php 2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b Add rfc and dayall format for extrafields date 2015-12-31 18:50:28 +01:00
phf
fffc8a430d FIX call trigger LINEBILL_SUPPLIER_CREATE 2015-12-31 15:48:16 +01:00
Laurent Destailleur
2cbcbb8f85 Merge pull request #4319 from ParisLiakos/develop 
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
 2015-12-31 15:04:16 +01:00
Laurent Destailleur
a234482d08 FIX #3694 2015-12-31 14:55:53 +01:00
Laurent Destailleur
c004342976 FIX #3694 2015-12-31 14:55:10 +01:00
Laurent Destailleur
bc56b9a2a7 Merge pull request #4313 from braito4/patch-2 
Fix Warning #4229 PHP7
 2015-12-31 14:48:50 +01:00
Laurent Destailleur
c63cbe34c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-31 12:02:36 +01:00
Laurent Destailleur
5a49b8ce53 Fix: error when running install twice 
Fix: a minor error was locking the full upgrade process.
 2015-12-31 12:02:22 +01:00
aspangaro
2c1ff3ca47 Merge remote-tracking branch 'Upstream/develop' into develop-a7 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2015-12-31 06:07:08 +01:00
Juanjo Menent
d07cb62cf0 Merge pull request #4318 from mrsof/patch-3 
FIX: Field cost_price does not exist and typos
 2015-12-30 21:57:59 +01:00
Juanjo Menent
3aba3eda3c Merge pull request #4316 from marcosgdf/bug-4272 
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
 2015-12-30 21:49:52 +01:00
Juanjo Menent
08b4903057 Merge pull request #4315 from marcosgdf/bug-4155 
FIX #4155 Search Categories error
 2015-12-30 21:49:25 +01:00
fmarcet
cebb996120 FIX: Email templates not compatible with Multicompany 2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30 FIX: Email templates not compatible with Multicompany 2015-12-29 10:35:10 +01:00
Paris Liakos
b6b422042c MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden 2015-12-29 03:43:49 +02:00
Sof
c04eef35d5 FIX: Field cost_price does not exist and typos 2015-12-28 19:07:25 +01:00
Marcos García de La Fuente
039039bb00 FIX #3798 #2519 Cron jobs would never be executed 2015-12-28 15:17:53 +01:00
Marcos García de La Fuente
bec00e37e0 FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty 2015-12-28 15:04:24 +01:00
bobby
86fc8f0465 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-28 14:06:22 +01:00
Marcos García de La Fuente
5773171efc FIX #4155 Search Categories error 2015-12-28 14:04:37 +01:00
Laurent Destailleur
41516093bb Syn transifex 2015-12-28 12:21:24 +01:00
braito4
47ee8993d3 fix travis 2015-12-28 11:47:12 +01:00
bobby
68b3480c86 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-28 11:46:02 +01:00
braito4
07f7717b51 Fix Warning #4229 PHP7 2015-12-28 11:28:18 +01:00
bobby
46532ccb55 FIX/NEW : Accountancy 2015-12-28 11:08:14 +01:00
bobby
eec22169e3 FIX feature 2015-12-28 10:21:38 +01:00
bobby
10ff19eb46 NEW : if nb total of lines provided in print barre_liste, display in 
title
 2015-12-28 10:20:23 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
Laurent Destailleur
cfd01b6060 Fix package for 3.8.3 2015-12-27 23:50:13 +01:00
Laurent Destailleur
a2e93056f7 Prepare 3.8.3 2015-12-27 23:42:09 +01:00
Laurent Destailleur
6905842794 Update list of module in demo with new 3.8 modules 2015-12-27 20:31:39 +01:00
Laurent Destailleur
f13df0f952 Prepare 3.7.3 2015-12-27 20:17:46 +01:00
Laurent Destailleur
a2c8208541 Prepare 3.6.5 2015-12-27 19:17:05 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Laurent Destailleur
e536e10269 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:06:31 +01:00
Laurent Destailleur
06754068ff Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3 Prepare package 3.6.6 2015-12-27 18:56:15 +01:00
Laurent Destailleur
40963f2f2a FIX #4207 2015-12-27 18:46:21 +01:00
Bahfir Abbes
ce49c0d5dc Update conf.class.php 
I used  dol_sanitizeFileName only for $file in order to not clean the two '/' characters needed in the path
 2015-12-27 18:27:18 +01:00
Laurent Destailleur
bf15ff56e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-27 18:26:31 +01:00
Laurent Destailleur
0645938283 FIX #4230 PHP7 error 2015-12-27 18:26:21 +01:00