Commit Graph

51549 Commits

Author SHA1 Message Date
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
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
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
braito4
07f7717b51 Fix Warning #4229 PHP7 2015-12-28 11:28:18 +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 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 3.7.3 2015-12-27 20:17:46 +01:00
Laurent Destailleur
a2c8208541 Prepare 3.6.5 3.6.6 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
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
Laurent Destailleur
46d122c43a Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-27 18:20:58 +01:00
Laurent Destailleur
97030b05ce FIX #4281 2015-12-27 18:20:39 +01:00
Laurent Destailleur
70b73f2d51 Merge pull request #4306 from marcosgdf/bug-3980
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
2015-12-27 17:38:33 +01:00
Laurent Destailleur
5afed31265 Merge pull request #4305 from marcosgdf/bug-4036
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 17:37:29 +01:00
Laurent Destailleur
80989fd2c9 Merge pull request #4304 from marcosgdf/bug-4302
FIX #4302 Undefined variable $conf in Commande::LibStatut
2015-12-27 17:37:02 +01:00
Laurent Destailleur
ff6dc32827 Merge pull request #4303 from marcosgdf/bug-4282
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
2015-12-27 17:36:48 +01:00
Laurent Destailleur
299e34f3ee Merge pull request #4294 from marcosgdf/bug-4287
FIX #4287 SQL error when accessing an unexisting proposal
2015-12-27 17:33:09 +01:00
Laurent Destailleur
68ee482915 Merge pull request #4293 from marcosgdf/patch-2
Little typo in commit 8b633ae
2015-12-27 17:32:02 +01:00
Laurent Destailleur
e93ec106bc Merge pull request #4290 from defrance/patch-92
add odt info function call if present in class
2015-12-27 17:26:26 +01:00
Laurent Destailleur
a9b52f36e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-27 17:06:05 +01:00
Laurent Destailleur
c64eac5e72 Fix doc and mysql min version 2015-12-27 17:05:56 +01:00
Laurent Destailleur
7d84dd8f52 Merge pull request #4269 from FHenry/develop
FIX : Working on accountancy
2015-12-27 17:03:51 +01:00
Marcos García de La Fuente
ebdaf7dfa6 FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7 2015-12-27 15:12:02 +01:00
Marcos García de La Fuente
c40c695d20 FIX #4036 Direct printing module without any driver configured, shows an unformatted error message 2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
98351d6fec FIX #4302 Undefined variable $conf in Commande::LibStatut 2015-12-27 13:15:05 +01:00
Marcos García de La Fuente
67bdfa2617 FIX #4282 Defined shipping time were not shown in Customer order's PDF documents 2015-12-27 13:10:33 +01:00
Regis Houssin
c65babf3b5 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-12-27 12:50:41 +01:00
bobby
e557c002c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-26 11:56:10 +01:00