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
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
Laurent Destailleur
9bb9d4d36e Fix position of field and tooltip 2017-01-20 12:08:33 +01:00
arnaud
2cedcfece2 FIX bug margin calcul by user with multicompany 2017-01-20 12:01:20 +01:00
Laurent Destailleur
4047de82bd Fix navigation on projects 2017-01-20 10:27:37 +01:00
Laurent Destailleur
8ec1784e41 Better translation 2017-01-20 09:46:36 +01:00
gauthier
a944c82d86 FIX : $progress_width initialized 2017-01-19 09:11:06 +01:00
Laurent Destailleur
03c1521cde Merge pull request #6271 from altatof/fix_extra_input 
FIX: extrafield input for varchar was not working with special char
 2017-01-18 16:53:43 +01:00
Laurent Destailleur
9d6f84c3a0 FIX Try a better fif for #6074 2017-01-18 16:27:23 +01:00
Laurent Destailleur
3336943ff2 Fix responsive 2017-01-18 15:49:12 +01:00
Laurent Destailleur
d48f2507b5 Fix link attachment on bank document page 2017-01-18 15:37:45 +01:00
Laurent Destailleur
ddbb7ee1f4 Fix bad alignement 2017-01-18 15:26:50 +01:00
Laurent Destailleur
b6383399aa Fix bad colspan 2017-01-18 15:23:37 +01:00
Laurent Destailleur
8f577b0754 Fix bad link 2017-01-18 15:19:17 +01:00
Laurent Destailleur
6f3677a322 FIX total payed wrong 2017-01-18 13:28:02 +01:00
Laurent Destailleur
c8957a9184 Prepare rc2 2017-01-18 12:49:36 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not 
received.
 2017-01-17 20:05:10 +01:00
Laurent Destailleur
bb95f139a8 Fix responsive 2017-01-17 20:04:41 +01:00
Laurent Destailleur
13d01a7010 Fix css 2017-01-17 17:49:49 +01:00
Laurent Destailleur
7a0d388073 Fix if not defined, set default value from constant 2017-01-17 11:53:28 +01:00
Laurent Destailleur
86e690a064 Fix translation 2017-01-17 11:35:38 +01:00
Laurent Destailleur
ec5c4ebf6b FIX timeout during export (can be solved only if safe_mode is off) 2017-01-17 11:20:56 +01:00
arnaud
39f35bbaab FIX all dolibarr versions about project list and ajax completion bug 2017-01-17 11:17:40 +01:00
Laurent Destailleur
16779be162 Fix missing email/multicompany field 2017-01-17 10:51:30 +01:00
Laurent Destailleur
c9ca35ebd1 Fix translation 2017-01-17 10:48:38 +01:00
Laurent Destailleur
ce37a855ce Fix translation 2017-01-17 10:44:48 +01:00
Laurent Destailleur
1ded1bd52a Fix: missing email 2017-01-17 10:34:35 +01:00
Laurent Destailleur
d21bb1e6b1 FIX #6237 2017-01-16 13:10:54 +01:00
Laurent Destailleur
7ebb5f7d92 FIX #6270 2017-01-16 13:06:26 +01:00
Laurent Destailleur
fdbe4051f1 FIX #6230 2017-01-16 12:54:51 +01:00
Laurent Destailleur
c1d6ad90b3 FIX #6255 2017-01-16 12:35:19 +01:00
Laurent Destailleur
43cb9c30b2 Fix var_dump 2017-01-16 12:21:37 +01:00
Laurent Destailleur
c01baf1223 FIX #6255 2017-01-16 12:16:49 +01:00
Laurent Destailleur
4f949bea29 FIX #6273 2017-01-16 11:46:30 +01:00
Laurent Destailleur
983f707553 Add comment 2017-01-16 11:35:25 +01:00
Laurent Destailleur
9c60474953 FIX #6277 2017-01-16 11:06:17 +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
altatof
3dd160c663 use dol_escape_htmltag 2017-01-16 09:17:37 +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
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +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
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
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
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
altatof
55c0a99bce fix was not at the right place 2017-01-13 15:42:07 +01:00
altatof
487b5b25db FIX: extrafield input for varchar was not working with special char 
within (ie double quotes)
 2017-01-13 15:37:33 +01:00
Laurent Destailleur
31818e8816 Fix missing translation 2017-01-13 15:32:20 +01:00
gauthier
a90ec7a8c7 FIX : hidetop progression 2017-01-13 14:59:29 +01:00
Laurent Destailleur
3a2f44adac Fix security permissions to edit/delete time spent 2017-01-13 14:24:39 +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
edb79de54e FIX javascript error 2017-01-12 18:07:19 +01:00
gauthier
1886e68731 FIX : progress size 2017-01-12 17:07:22 +01:00
gauthier
307c06dfc3 FIX : pdf invoice when we use situation 2017-01-12 16:26:09 +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
Laurent Destailleur
13787881d4 Fix css 2017-01-12 11:46:13 +01:00
Laurent Destailleur
e82aa97d0e Merge pull request #6266 from simnandez/4.0 
FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page
 2017-01-12 11:13:14 +01:00
Laurent Destailleur
c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php
 2017-01-12 11:06:24 +01:00
Laurent Destailleur
762dd8030e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-12 10:59:41 +01:00
Laurent Destailleur
7476a3c8ae Fix error during migration 2017-01-12 10:59:27 +01:00
Laurent Destailleur
e802ff3385 Fix POO declaration 2017-01-12 10:57:15 +01:00
Laurent Destailleur
5e71ff816f Increase limit for better backward compatibility without loosing minimum 
security.
 2017-01-12 10:51:31 +01:00
Laurent Destailleur
351c416ed8 Merge pull request #6265 from hregis/4.0_bug 
Fix: avoid errors if constants values not exists
 2017-01-12 10:49:23 +01:00
Laurent Destailleur
721534d676 Merge pull request #6264 from atm-florian/5.0 
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of "NULL")
 2017-01-12 10:39:13 +01:00
Laurent Destailleur
f408c886b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-12 10:16:32 +01:00
Laurent Destailleur
3d8c5b377b Fix string not translated 2017-01-12 10:16:19 +01:00
Laurent Destailleur
46e330f749 Merge pull request #6256 from aspangaro/5.0-23 
Fix : Bank - Presentation, no titlefield in a list
 2017-01-12 10:09:38 +01:00
Laurent Destailleur
7a8a95c815 Merge pull request #6249 from KiteAtao/4.0 
Fix #6247 #6248 Contact and Commands REST WebServices failed
 2017-01-12 10:08:32 +01:00
Laurent Destailleur
4ea78d20f0 Merge pull request #6251 from aspangaro/5.0-22 
Fix : Bank - Missing language file
 2017-01-12 10:06:42 +01:00
Laurent Destailleur
749f8cf252 Fix translation 2017-01-12 00:15:00 +01:00
Juanjo Menent
bcba4a1a38 FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter 2017-01-11 20:48:32 +01:00
Juanjo Menent
ac58fd91af FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter 2017-01-11 20:46:50 +01:00
Juanjo Menent
eb2ea07c76 FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page 2017-01-11 20:32:39 +01:00
Regis Houssin
5898d27609 Fix: avoid errors if constants values not exists 2017-01-11 16:47:17 +01:00
Laurent Destailleur
5553be4aa9 Fix code comment 2017-01-11 16:08:04 +01:00
florian HENRY
2c2bb366bd fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of 
"NULL")
 2017-01-11 09:19:07 +01:00
Laurent Destailleur
1559c45a61 FIX link for not found photo when using gravatar. Must use external url 2017-01-10 09:24:55 +01:00
Laurent Destailleur
70e6c2d41f Fix bad count of nb of contacts in statistics 2017-01-10 00:42:28 +01:00
Laurent Destailleur
decbda3e23 Fix inversion application name - company name 2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27 Fix generic text must be set before specific for notification 2017-01-09 21:07:54 +01:00
Laurent Destailleur
8ab0ad3b72 Fix css 2017-01-09 10:36:24 +01:00
Laurent Destailleur
03aa8343fd Fix css 2017-01-09 10:21:35 +01:00
Laurent Destailleur
62a668d899 Fix https link 2017-01-09 10:02:17 +01:00
aspangaro
a583fd7a3b Fix : Bank - Presentation, no titlefield in a list 2017-01-08 20:52:42 +01:00
Laurent Destailleur
dba777c57b Fix missing field alias 2017-01-08 12:10:07 +01:00
Laurent Destailleur
1856b5cfb8 Fix filter on status for third parties 2017-01-08 11:50:43 +01:00
Laurent Destailleur
913df73ed9 Fix css 2017-01-08 11:31:39 +01:00
Laurent Destailleur
41832a0c26 Fix neutral color on login (no theme yet selected) 2017-01-08 11:20:29 +01:00
aspangaro
dc605c915a Fix : Bank - Missing language file 2017-01-08 07:46:30 +01:00