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

49745 Commits

Author SHA1 Message Date
Laurent Destailleur
b4b81d8dcb Fix css and missing translation key 2017-01-29 15:07:18 +01:00
Laurent Destailleur
24c21cca27 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-28 15:56:27 +01:00
Laurent Destailleur
4f76626f51 FIX Creation of credit note on invoice with deposit stole the discount. 2017-01-28 15:55:44 +01:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
 2017-01-28 15:12:14 +01:00
Laurent Destailleur
2c07d2df22 Add comments 2017-01-28 15:08:46 +01:00
Laurent Destailleur
c88e63ecc9 FIX #6259 2017-01-28 15:01:17 +01:00
Laurent Destailleur
e2ce31e1a7 Add code comment 2017-01-28 14:54:51 +01:00
Laurent Destailleur
1e78c4c418 FIX Change the customer code only if error on duplicate 2017-01-28 14:54:06 +01:00
Laurent Destailleur
7c638feb3b Fix label of field 2017-01-28 13:13:57 +01:00
Laurent Destailleur
bc8ccd8ec5 Fix bad var set 2017-01-28 13:01:10 +01:00
Laurent Destailleur
4bce208035 FIX detail of deposit and credit not was not visible into final invoice 2017-01-28 12:42:02 +01:00
Laurent Destailleur
27caa586c2 Fix auto increment customer code must be done only if error is on 
duplicate code
 2017-01-28 12:36:53 +01:00
Laurent Destailleur
63f614d1d5 Fix color switching threshold 2017-01-27 13:22:36 +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
ade8fd1415 Fix table format 2017-01-27 01:20:56 +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
3991caa674 Merge branch '5.0' into 5.0_bug2 2017-01-27 00:36:27 +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
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
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
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
Ferran Marcet
c56074d48f Fix: Travis error 2017-01-25 16:11:06 +01:00
Ferran Marcet
cb5117ad06 Fix: Invalid variable. Shoud be $object 2017-01-25 16:08:46 +01:00
Ferran Marcet
7f87f6688b Fix: Invalid variable. Shoud be $object 2017-01-25 12:58:21 +01:00
altatof
09dde659d5 FIX: add entity param to document link 2017-01-25 09:26:26 +01:00
altatof
d65cb29536 FIX: use param for http links 2017-01-25 09:25:06 +01:00
Laurent Destailleur
755d353dfa Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2017-01-24 18:41:29 +01:00
Laurent Destailleur
84fec7c5c7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2017-01-24 18:40:01 +01:00
Laurent Destailleur
b1e5d8ce98 FIX Combo list of VAT is wrong on POS 2017-01-24 14:33:49 +01:00
fappels
2be6011069 Fix product elephant verify for service 2017-01-23 20:59:32 +01:00
Laurent Destailleur
ecc6cb5596 Fix button at wrong place 2017-01-23 20:38:26 +01:00
Laurent Destailleur
25df6b799a Fix loading lang 2017-01-23 17:36:50 +01:00
Laurent Destailleur
9a59fbada7 Fix missing info admin picto. Fix colspan. 2017-01-23 17:31:39 +01:00