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

49813 Commits

Author SHA1 Message Date
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
Laurent Destailleur
fbf9986506 Fix translation 2017-01-31 18:03:25 +01:00
Laurent Destailleur
2db372d99d Fix css 2017-01-31 16:17:24 +01:00
Laurent Destailleur
aaa2e393c3 Fix css 2017-01-31 16:17:10 +01:00
fappels
8e675fa039 Improve lot qty separation 
Add spaces to lot info separation.
Use implode params according PHP doc.
 2017-01-31 12:54:00 +01:00
Maxime Kohlhaas
90e8f062e9 Fix : link to user in bank was wrong regarding expensereport payment 2017-01-31 10:23:03 +01:00
arnaud
c79137d14c FIX Supplier Order list filter by project 2017-01-30 17:29:01 +01:00
Laurent Destailleur
f16e65c6b1 Fix css 2017-01-30 12:22:58 +01:00
Laurent Destailleur
5e4509953d Associated product must be on another export profile 2017-01-29 21:25:29 +01:00
Laurent Destailleur
45263c85ec Fix in emailing 2017-01-29 20:33:08 +01:00
Laurent Destailleur
ff8b7e6e4d Fix size of email 2017-01-29 18:35:56 +01:00
Laurent Destailleur
92e61e6707 Fix hide url if not defined 2017-01-29 18:29:37 +01:00
Laurent Destailleur
45c99d9d24 Fix HTML5 error 2017-01-29 16:46:59 +01:00
Laurent Destailleur
d7c2bdba38 Fix: link was useless with a nofollow tag. 2017-01-29 16:42:59 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
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
Juanjo Menent
3e14a89eb0 Fix #6314 2017-01-27 23:05:29 +01:00
Laurent Destailleur
63f614d1d5 Fix color switching threshold 2017-01-27 13:22:36 +01:00
Charlie Root
c0b4667713 NEW: Use the expense repport author account instead of the default account, if exists 2017-01-27 10:50:50 +01:00
Maxime Kohlhaas
7b6488b1c7 Fix numbering was disaplying technical error instead of error message 2017-01-27 10:05:57 +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
Laurent Destailleur
05582e9586 Sync transifex 2017-01-23 17:31:09 +01:00
Regis Houssin
9dca9e4f8b Fix: travis error - Space found before comma in function call 2017-01-23 13:46:25 +01:00
Regis Houssin
e4eb2d2aaf Fix: explode array result is 0,1,2 and not 1,2,3 2017-01-23 13:36:55 +01:00
Regis Houssin
7980f1c999 Fix: avoid php non-numeric errors 2017-01-23 12:29:05 +01:00
Regis Houssin
0479fdb0a2 Fix: avoid non-numeric error 2017-01-23 12:25:39 +01:00
Regis Houssin
e2e4403869 Fix: avoid numeric errors 2017-01-23 12:20:44 +01:00
Laurent Destailleur
00ea5d3de0 Mising translation 2017-01-23 10:32:14 +01:00
Laurent Destailleur
bc10246d05 Fix bad amount on invoice. Table of supplier discount not yet available. 2017-01-22 23:19:14 +01:00
Laurent Destailleur
aa1ccad714 Fix permission 2017-01-22 23:08:11 +01:00
Laurent Destailleur
b011d6e188 Fix date of invoice in future. 2017-01-22 23:00:40 +01:00
Laurent Destailleur
db220e7af5 FIX Rename api_key into DOLAPIKEY to allow to use it on http header. 2017-01-22 20:55:26 +01:00
Laurent Destailleur
34cf1fdd76 Fix if logo is not defined 2017-01-22 16:07:48 +01:00
Laurent Destailleur
f875597c0b Fix statistics of leave requests (date valid not defined if status is 
draft)
 2017-01-22 16:03:08 +01:00
Laurent Destailleur
581b61bef1 CSS and look 2017-01-22 15:03:07 +01:00
Laurent Destailleur
433ad9d59d Fix responsive 2017-01-22 13:27:17 +01:00
Laurent Destailleur
66819a34fa Fix several bugs 2017-01-22 13:19:07 +01:00
Laurent Destailleur
b0e9f31474 Fix responsive 2017-01-22 12:43:25 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
6ab9ba3284 Fix management of alternative language for Greek (el_CY) 2017-01-21 21:52:42 +01:00
Laurent Destailleur
31480a902b Remove obsolete file 2017-01-21 21:12:01 +01:00
Laurent Destailleur
b8a80f9311 Fix code comment and missing showLinkToObjectBlock hook declaration as 
an addreplace hook.
 2017-01-21 17:30:35 +01:00
Laurent Destailleur
3a2d9c8610 Fix for rtl languages 2017-01-21 16:12:25 +01:00
BENKE Charlie
e6697c32c4 Update images.lib.php 
in fact $dir is not used in the function

Conflicts:
	htdocs/core/lib/images.lib.php
 2017-01-21 12:56:39 +01:00
Laurent Destailleur
1add34b451 Fix multicompany 2017-01-20 21:05:20 +01:00
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
Laurent Destailleur
eb09519a26 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-20 20:44:30 +01:00
Laurent Destailleur
9ebe383beb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-20 20:44:19 +01:00
Laurent Destailleur
0a4b29e1c4 Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation 
Fix pdf invoice with situation
 2017-01-20 18:10:24 +01:00
Ion
f23f2e61f5 Fix #6161 supplier order to facture not working 2017-01-20 18:09:26 +01:00
Laurent Destailleur
ac32161711 Fix error in total of tasks 2017-01-20 14:36:56 +01:00
Laurent Destailleur
2f4ff66c43 Minor fixes 2017-01-20 14:10:57 +01:00
Laurent Destailleur
b4733e043c Fix tooltip when customer is closed 2017-01-20 12:17:10 +01:00