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

57668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
055a00a338 fix travis 2017-01-27 15:18:12 +01:00
florian HENRY
cb6209de31 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-27 15:16:28 +01:00
Laurent Destailleur
10bacda820 Prepare migration 5-6 2017-01-27 13:56:16 +01:00
Laurent Destailleur
fcfea4e6d1 Add missing field fk_user_modif 2017-01-27 13:26:31 +01:00
Laurent Destailleur
68711184b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-27 13:23:41 +01:00
Laurent Destailleur
8d9639cd09 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-27 13:23:21 +01:00
Laurent Destailleur
63f614d1d5 Fix color switching threshold 2017-01-27 13:22:36 +01:00
Laurent Destailleur
87a74e78b6 Merge pull request #6246 from atm-florian/develop 
NEW : supplier invoice : calculation of limit payment date on update
 2017-01-27 01:46:43 +01:00
Laurent Destailleur
f919f70096 Merge branch 'develop' into develop 2017-01-27 01:46:21 +01:00
Laurent Destailleur
c48400331f Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date 
NEW get multicurrency rate from document date (propal, order)
 2017-01-27 01:32:52 +01:00
Laurent Destailleur
119d0c3938 Merge pull request #6231 from IonAgorria/mail-lines 
#NEW: Add email template for each line in object
 2017-01-27 01:30:53 +01:00
Laurent Destailleur
29df2c9115 Merge branch 'develop' into mail-lines 2017-01-27 01:29:58 +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
025036595d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-27 01:23:56 +01:00
Laurent Destailleur
8a4e957554 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-27 01:23:44 +01:00
Laurent Destailleur
f2f8d7b6a5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:21:34 +01:00
Laurent Destailleur
9f1959ffc8 Fix MVC Actions must be done before output 2017-01-27 01:21:20 +01:00
Laurent Destailleur
ade8fd1415 Fix table format 2017-01-27 01:20:56 +01:00
Laurent Destailleur
105a53b333 Merge pull request #6333 from atm-quentin/Mass_withdrawal_request 
NEW Mass withdrawal request
 2017-01-27 00:55:16 +01:00
Laurent Destailleur
dae3e03603 Merge pull request #6323 from fappels/Fix_3.9_elephant_code_verif 
Fix verify of elephant code model for services
 2017-01-27 00:53:56 +01:00
Laurent Destailleur
14c31b451c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-27 00:53:04 +01:00
Laurent Destailleur
3c86507ce6 FIX #6328 2017-01-27 00:51:22 +01:00
Laurent Destailleur
44b1eb9e4c Merge pull request #6322 from hregis/5.0_bug2 
Fix: explode array result is 0,1,2 and not 1,2,3
 2017-01-27 00:36:35 +01:00
Laurent Destailleur
3991caa674 Merge branch '5.0' into 5.0_bug2 2017-01-27 00:36:27 +01:00
Laurent Destailleur
3321d865d7 Merge pull request #6304 from IonAgorria/fix-objelem 
NEW: Add supplier order/invoice to elementproperties
 2017-01-27 00:34:17 +01:00
Laurent Destailleur
1239e8600a Merge pull request #6326 from altatof/fix_entity_thirdpart_files 
Fix entity thirdparty files links
 2017-01-27 00:30:03 +01:00
Laurent Destailleur
65f493ac41 Merge pull request #6321 from hregis/5.0_bug 
Fix: avoid numeric errors
 2017-01-27 00:27:47 +01:00
Laurent Destailleur
b3901e059d Merge pull request #6331 from defrance/patch-69 
PHP7 warning error on $page not affected
 2017-01-27 00:26:36 +01:00
Laurent Destailleur
94649514f4 Merge pull request #6329 from fmarcet/5.0 
Fix: Invalid variable. Shoud be $object
 2017-01-27 00:25:20 +01:00
Laurent Destailleur
4c28e1598b Merge branch '5.0' into 5.0 2017-01-27 00:25:12 +01:00
Laurent Destailleur
9281cb9f8a Merge pull request #6336 from atm-florian/5.0_fix 
fix : wrong $formproject->select_projects call on model invoice
 2017-01-27 00:21:51 +01:00
Laurent Destailleur
053afe21dd Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2017-01-26 23:40:16 +01:00
Laurent Destailleur
ca79d0c274 Fix PHPCS 2017-01-26 23:36:58 +01:00
Laurent Destailleur
72fd21b183 Fix phpcs 2017-01-26 20:41:16 +01:00
Laurent Destailleur
60ac751d84 Fix translation 2017-01-26 18:21:39 +01:00
Laurent Destailleur
c1b59b1950 Fix several security bugs on expense report 2017-01-26 18:08:00 +01:00
florian HENRY
a333a328d8 FIX #6338 2017-01-26 16:32:36 +01:00
florian HENRY
deceeea8ff fix extrafield list of fileds 2017-01-26 15:44:09 +01:00
florian HENRY
32ebe8f4d7 fix : ressource extrafield in list 2017-01-26 14:38:49 +01:00
Laurent Destailleur
4839d06fc3 Fix log 2017-01-26 12:48:32 +01:00
Laurent Destailleur
c39fcce9f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-26 10:45:38 +01:00
Laurent Destailleur
9889f0a4a2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/modProjet.class.php
	htdocs/filefunc.inc.php
 2017-01-26 10:44:50 +01:00
Laurent Destailleur
eac6ac0247 Fix fields into projet export 2017-01-26 10:41:02 +01:00
florian HENRY
f0ba5cdba8 fix travais 2017-01-26 09:02:47 +01:00
florian HENRY
28115689e8 fix : wrong $formproject->select_projects call on model invoice 2017-01-26 08:46:39 +01:00
Ferran Marcet
0df39149c4 Fix: Hidden option not showing correctly 2017-01-25 19:28:20 +01:00
Ferran Marcet
debfb97903 Fix: Write All Right don't work 2017-01-25 19:12:02 +01:00
Ferran Marcet
daa4536f83 Fix: Contract clone don't work 2017-01-25 18:58:47 +01:00
BENKE Charlie
e73a132ed9 PHP7 warning error on $page not affected 2017-01-25 16:24:12 +01:00