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

57445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
Laurent Destailleur
da64d4d398 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 10:58:45 +01:00
Laurent Destailleur
fafe71ec52 Fix autocalculation of surface and volume. 2017-01-16 10:55:33 +01:00
Laurent Destailleur
1b1bab94ca More complete commit for #6114 2017-01-16 10:43:22 +01:00
Laurent Destailleur
81d76f8600 Merge pull request #6114 from defrance/patch-52 
NEW Allow to change heigth and width on product
 2017-01-16 10:19:47 +01:00
Laurent Destailleur
41f6d70eaf Merge pull request #6269 from defrance/patch-65 
Fix: forgotten translation
 2017-01-16 10:18:37 +01:00
Laurent Destailleur
d2b766f9f4 Fix PHP 7.1 2017-01-16 10:17:25 +01:00
Laurent Destailleur
f36dea5be7 Fix holiday class 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2017-01-16 09:32:04 +01:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
Laurent Destailleur
f43b3ebda4 Fix holiday class 2017-01-16 09:30:00 +01:00
Laurent Destailleur
36bd63c1a7 NEW PHP 7.1 compatibility 2017-01-16 09:05:18 +01:00
Laurent Destailleur
a05132d26e Fix PHP 7.1 error 2017-01-16 09:05:09 +01:00
Laurent Destailleur
6a79a80320 Reenable php 7.1 2017-01-16 08:50:17 +01:00
Laurent Destailleur
10a10f459c Update ChangeLog 2017-01-16 01:23:43 +01:00
Laurent Destailleur
6bfd534a36 NEW PHP 7.1 compatibility 2017-01-16 01:21:33 +01:00
Laurent Destailleur
9d72f1df62 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 01:12:11 +01:00
Laurent Destailleur
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +01:00
Laurent Destailleur
94a180a775 Fix POO best practice 2017-01-16 00:54:08 +01:00
Laurent Destailleur
9c1895a03a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:49:19 +01:00
Laurent Destailleur
846e827e09 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/core/class/html.formfile.class.php
	htdocs/product/stats/card.php
 2017-01-16 00:48:37 +01:00
Laurent Destailleur
9f17e56923 Merge pull request #6279 from hregis/4.0_bug3 
Fix: search problem if name contains accents
 2017-01-16 00:44:56 +01:00
Laurent Destailleur
25958c241b Merge pull request #6278 from hregis/4.0_bug2 
Fix: avoid foreach error
 2017-01-16 00:43:41 +01:00
Laurent Destailleur
0bac99028e Merge pull request #6276 from aljawaid/develop 
Fix: Add Missing Translation String
 2017-01-16 00:43:00 +01:00
Laurent Destailleur
ed6e3fe8a0 Merge pull request #6275 from hregis/4.0_bug 
Fix: preview image not show with multicompany product sharing
 2017-01-16 00:41:15 +01:00
Laurent Destailleur
6903acfe1c Include php 7.1 in tests 2017-01-16 00:22:12 +01:00
Laurent Destailleur
d95ac3bbdd Fix warning 2017-01-16 00:16:20 +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
0671f75417 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-16 00:01:37 +01:00
Laurent Destailleur
0fe844aa00 FIX usage of tag {y} in numbering modules 2017-01-16 00:01:06 +01:00
Laurent Destailleur
7bccaff28a Fix remove warnings 2017-01-15 23:32:14 +01:00
Laurent Destailleur
54a974cb5c Fix position of dropdown tooltip 2017-01-15 21:03:44 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Regis Houssin
f9ed1592e1 Fix: search problem if name contains accents 2017-01-15 16:07:04 +01:00
Regis Houssin
c3997194b2 Fix: avoid foreach error 2017-01-15 15:17:32 +01:00
Regis Houssin
fd4a19855d Fix: preview image not show with multicompany product sharing 2017-01-15 12:09:26 +01:00
IJ
79714f7ede Merge pull request #2 from aljawaid/aljawaid-patch-4 
Fix: Add Missing Translation String
 2017-01-15 11:06:51 +00:00
IJ
d5120ae7cc Fix: Add Missing Translation String 
When product batch module is disabled, the translation string is missing for dispatch line.
 2017-01-15 11:04:32 +00:00
Laurent Destailleur
1fd9f5e1fb Fix: host was twice into message id for smtp driver and swiftmailer was 
not using dol_getprefix() to build host.
 2017-01-14 13:27:44 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Laurent Destailleur
29f07d3e89 The tutorial to add cron is sometimes false. Quick hack for a solution 
to hide it.
 2017-01-13 16:39:35 +01:00
Laurent Destailleur
31818e8816 Fix missing translation 2017-01-13 15:32:20 +01:00
Laurent Destailleur
3a2f44adac Fix security permissions to edit/delete time spent 2017-01-13 14:24:39 +01:00
BENKE Charlie
6014314610 forgotten translation 
translation lefted on last 5.RC version
 2017-01-13 09:05:10 +01:00
Laurent Destailleur
380b61a0e9 FIX Can make a stock transfert on product not on sale/purchase. 2017-01-12 21:56:50 +01:00
Laurent Destailleur
c3e5e0dd3f Update doc 2017-01-12 21:50:35 +01:00
Laurent Destailleur
edb79de54e FIX javascript error 2017-01-12 18:07:19 +01:00
Laurent Destailleur
32a453e8e6 Fix label combo 2017-01-12 15:44:20 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
8d5c853267 FIX Protection so even if link is output for external user, links is 
disabled.
 2017-01-12 15:12:53 +01:00