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

42607 Commits

Author SHA1 Message Date
Laurent Destailleur
c707c899c1 Fix remove warning 2015-09-26 13:22:05 +02:00
Laurent Destailleur
fef8203e65 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 12:01:58 +02:00
Laurent Destailleur
a3647bea4e Fix bad information in report 2015-09-26 11:53:36 +02:00
Laurent Destailleur
5a2dc88d42 Merge pull request #3610 from defrance/patch-80 
3.8 bad filtering caused by statut filter #3580
 2015-09-26 11:20:54 +02:00
Laurent Destailleur
b99ef6b27c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 11:05:12 +02:00
Laurent Destailleur
4e77a651d4 Merge pull request #3600 from fmarcet/3.8 
FIX #3599 Not saving legal form
 2015-09-26 11:05:02 +02:00
Laurent Destailleur
9644e242ae Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 11:04:32 +02:00
Laurent Destailleur
5f765419ea Fix because project module introduced opportunity, user may create 
project (opportunity) even when thirdparty does not exists yet, so we
must provide a solution for this.
 2015-09-26 11:04:17 +02:00
Laurent Destailleur
f3ba115ef0 Fix missing default value 2015-09-26 10:53:59 +02:00
Laurent Destailleur
7424b521ed Merge pull request #3609 from aspangaro/3.8-20 
Fix centering on login page
 2015-09-26 10:30:24 +02:00
BENKE Charlie
8dcd6158e3 3.8 bad filtering caused by statut filter #3580 
correction ported on 3.8 too, sorry for the bad step process
 2015-09-26 10:15:42 +02:00
Juanjo Menent
b8bf21b905 Merge pull request #3582 from grandoc/3.8 
FIX: order ref must not be translated
 2015-09-26 08:54:25 +02:00
aspangaro
df0e64eb7c Fix centering on login page 2015-09-26 07:59:06 +02:00
Laurent Destailleur
9d0cd148a8 Fix duplicate log 2015-09-25 11:47:24 +02:00
Laurent Destailleur
dcf3c00023 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-25 11:28:59 +02:00
Laurent Destailleur
c0433928c6 FIX sortder field was missing so manually added values were moved to 
begin.
 2015-09-25 11:28:49 +02:00
fmarcet
b5b90d1639 FIX #3599 Not saving legal form 2015-09-25 08:50:00 +02:00
Laurent Destailleur
3ee5920947 Merge pull request #3571 from fmarcet/3.8 
FIX: When filter with empty status, by default get canceled status (-1)
 2015-09-24 18:40:06 +02:00
philippe
9e185eec75 FIX: order ref must not be translated 2015-09-24 15:29:17 +02:00
Laurent Destailleur
f8f1f4fd2b Merge branch 'patch-2' of https://github.com/AlainRnet/dolibarr into 
AlainRnet-patch-2

Conflicts:
	htdocs/categories/categorie.php
 2015-09-23 18:29:56 +02:00
tysauron
f3a28682ea For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 18:26:50 +02:00
phf
b222800012 FIX clone customer order create new order with validate ref and not with PROV 2015-09-23 15:14:08 +02:00
Florian HENRY
206d6d0f7e FIX : avoid SQL error in getValueFrom common object when all params are 
not send
 2015-09-23 13:17:58 +02:00
Florian HENRY
84fa92045c FIX : avoid SQL error when no sortfield send to method 2015-09-23 12:10:38 +02:00
Alexis Algoud
2d35124c71 FIX no need to remove file into mail form, the temp dir will be deleted after any sending 2015-09-23 11:11:19 +02:00
Laurent Destailleur
12a08ae4e1 Prepare 3.8.1 2015-09-23 10:25:06 +02:00
fmarcet
3ff8b3e437 FIX: Error retrieving customer prices 2015-09-23 10:23:29 +02:00
fmarcet
8309ed5c12 FIX: When filter with empty status, by default get canceled status (-1) 2015-09-23 09:24:49 +02:00
Laurent Destailleur
a70e73a963 FIX Missing validate button if permission are not valid. 2015-09-23 01:08:23 +02:00
tysauron
f1ab0d36c5 Chmod new file not old file 2015-09-23 00:32:30 +02:00
Laurent Destailleur
00b858e644 Merge pull request #3564 from FHenry/3.8 
FIX : remove twice same test
 2015-09-23 00:07:28 +02:00
Laurent Destailleur
dc89e6c516 Merge pull request #3557 from hregis/3.8 
Fix: use get instead getJSON for avoid freezing
 2015-09-22 23:56:36 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +02:00
Laurent Destailleur
90b78702e5 Update ignore to secure packaging 2015-09-22 16:23:51 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure 
Conflicts:
	htdocs/.gitignore
 2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Florian HENRY
178208918f FIX : remove twice same test 2015-09-22 12:03:11 +02:00
Laurent Destailleur
c2bdd9b465 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-22 11:29:49 +02:00
Laurent Destailleur
fe6af7d8eb FIX Description of tags was mandatory in edit mode but not in create 
mode. Should not be mandatory.
 2015-09-22 11:29:26 +02:00
AlainRnet
30bfb0eee3 Update categorie.php 
voir https://github.com/Dolibarr/dolibarr/pull/3562
 2015-09-22 09:40:13 +02:00
Laurent Destailleur
f2e2edbc64 FIX not closing CSS. 2015-09-21 15:10:52 +02:00
Laurent Destailleur
7d4a9b17b6 FIX Creation of tables or keys must not be done with a random order. 2015-09-21 14:00:02 +02:00
Regis Houssin
de04f3022c Fix: use get instead getJSON for avoid freezing 2015-09-20 09:05:52 +02:00
aspangaro
49f671eb1d Correct name 2015-09-19 07:24:32 +02:00
aspangaro
1901b2fb3b Missing translations in checks deposits exports 2015-09-19 07:15:13 +02:00
Laurent Destailleur
e85ddbb470 Merge pull request #3537 from GPCsolutions/3.8-3533 
FIX #3533 Load categories language
 2015-09-18 20:48:58 +02:00
Laurent Destailleur
378da082bd Fix selector or margin with jmobile 2015-09-18 20:43:10 +02:00
Laurent Destailleur
5f507cbbd8 Fix missing closing div making jmobile crazy 2015-09-18 20:23:06 +02:00
Laurent Destailleur
8699776930 Better usability with dolidroid 2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09 Fix javascript error 2015-09-18 16:05:38 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget 
FIX Style of previous-next card when using dolidroid
 2015-09-18 15:51:27 +02:00
Laurent Destailleur
14b6a74b2d Fix javascript error on POS 2015-09-18 14:13:15 +02:00
AlainRnet
8dd843ab8f Update categorie.php 
voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais)
 2015-09-17 23:23:18 +02:00
Laurent Destailleur
57521f628c Fix bad path 2015-09-17 19:35:03 +02:00
Laurent Destailleur
099e3f0376 FIX Removed warnings 2015-09-17 00:47:56 +02:00
Laurent Destailleur
313d9ddacd FIX #3534 2015-09-16 22:04:03 +02:00
Raphaël Doursenaud
6ffdbf91ec FIX #3533 Load categories language 2015-09-16 21:35:20 +02:00
Laurent Destailleur
7d8013b371 FIX #3533 2015-09-16 21:34:01 +02:00
Laurent Destailleur
38bae655ea Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-09-16 21:24:51 +02:00
Laurent Destailleur
e36928fd65 FIX #3529 2015-09-16 21:23:52 +02:00
Laurent Destailleur
7f60abdf7b FIX #3524 2015-09-16 21:05:02 +02:00
Marcos García de La Fuente
3818bff86a Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address 2015-09-16 12:49:05 +02:00
Marcos García de La Fuente
e80f29c271 Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed page 2015-09-16 12:47:13 +02:00
Florian HENRY
8fd9d2a7ce FIX : #3530 2015-09-16 10:21:32 +02:00
Juanjo Menent
7b8096d367 Merge pull request #3523 from defrance/patch-78 
fix error on tabcollectors and enhance
 2015-09-15 15:16:14 +02:00
Florian HENRY
a0fb27bd80 FIX : Can create Proposal on close thridparty #3526 2015-09-15 14:34:49 +02:00
BENKE Charlie
95cfce925f fix error on tabcollectors and enhance 
fix error on tabcollectors feature
add number of tabs present in tab collectors
 2015-09-15 03:33:27 +02:00
aspangaro
2d2f59fe3f Fix : Class 'Categorie' not found in core\class\html.form.class.php 2015-09-14 22:33:48 +02:00
Laurent Destailleur
d985c77eca Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-14 18:36:08 +02:00
Laurent Destailleur
e0a88fabd9 FIX #3521 2015-09-14 17:54:53 +02:00
Laurent Destailleur
36beb289f3 Merge pull request #3520 from aspangaro/3.8-18 
Fix #3225 Missing translations in interventions
 2015-09-14 17:24:42 +02:00
Laurent Destailleur
ca2b66ffb3 Merge pull request #3519 from aspangaro/3.8-17 
Fix #3227 #3226 Missing translations in supplier exports
 2015-09-14 17:24:22 +02:00
Laurent Destailleur
c75f62ddb7 FIX icon into export profile may be not correctly output 2015-09-14 12:12:14 +02:00
Laurent Destailleur
b4c964760d Sync transifex 2015-09-13 23:25:55 +02:00
Laurent Destailleur
3b01b8cb47 Fix security hole 2015-09-13 22:50:08 +02:00
aspangaro
334766d194 Fix #3225 Missing translations in interventions 2015-09-13 22:03:54 +02:00
aspangaro
27a85c074e Merge remote-tracking branch 'origin/3.8-18' into 3.8-17 2015-09-13 21:45:32 +02:00
aspangaro
1d4c747aa2 Fix #3227 #3226 Missing translations in supplier exports 2015-09-13 21:44:59 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
7c030a114d Release 3.8.0 2015-09-13 19:26:20 +02:00
aspangaro
a805cb9374 Fix: ER payments are on the bank credit 2015-09-13 16:33:02 +02:00
Juanjo Menent
ba3d8f445c Fix #3514 More elegant 2015-09-13 00:25:32 +02:00
Juanjo Menent
744e5375d2 Fix #3514 Bug: Error when trying to add a product to a non-existing object 2015-09-13 00:09:32 +02:00
Juanjo Menent
1deb77896f Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order 2015-09-12 23:42:48 +02:00
Laurent Destailleur
9aec4d554b Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab 2015-09-12 18:21:37 +02:00
Laurent Destailleur
db3c544e21 Fix #3240 [Supplier orders] Dashboard links to unuseful page 2015-09-12 18:14:08 +02:00
Laurent Destailleur
aa1661d64c Fix #3413 Translation of ExpireDate 2015-09-12 18:09:47 +02:00
Laurent Destailleur
67b7345e83 Fix the feature to log a cheque as returned. 
Fix duplicate parameter mainmenu and leftmenu into url
 2015-09-12 18:00:19 +02:00
Laurent Destailleur
97096536b1 Fix #2526 The filter on type numeric is ok now. Sometimes we used 
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
 2015-09-12 15:20:55 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage 
Conflicts:
	htdocs/ftp/index.php
 2015-09-12 12:55:20 +02:00
Laurent Destailleur
1966d75ced FIX #3490 2015-09-12 12:50:55 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-09-12 11:50:46 +02:00
Laurent Destailleur
0c3ebe63c2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/liste.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-12 11:44:07 +02:00
Laurent Destailleur
86b1a9cbce Merge remote-tracking branch 'origin/3.5' into 3.6 2015-09-12 11:38:25 +02:00
Laurent Destailleur
36632593c0 Fix SQL injections #3300 2015-09-12 11:36:19 +02:00
Laurent Destailleur
0bfccc7255 Fix print into form to attach file must be into return. 2015-09-12 11:35:56 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
a83b3ae7e8 Merge pull request #3503 from fappels/3.7-dispatch-rounding 
Fix #3471 3.7 Rounding issue when dispatching non-integer
 2015-09-12 11:07:16 +02:00
Maxime Kohlhaas
c6081f0fa2 Fix multientity stock management (F.Henry followup) 2015-09-11 20:38:32 +02:00
fappels
c290840513 Revert "Fix delete not used empty stock record" 
This reverts commit 1d85529eda.
 2015-09-10 23:31:23 +02:00
fappels
75a14e02d8 Fix #3471 3.7 Rounding issue when dispatching non-integer 2015-09-10 23:29:13 +02:00
fappels
8bdfdc0127 Fix #3471 3.5 Rounding issue when dispatching non-integer 2015-09-10 23:12:27 +02:00
fappels
a294700cef fix dispatch rounding version 1 2015-09-10 22:16:03 +02:00
Laurent Destailleur
7951483c5f Fix: examples ko for import 
Fix bad picto for export
 2015-09-10 12:47:25 +02:00
Juanjo Menent
70df553814 Merge pull request #3494 from FHenry/3.6 
3.6
 2015-09-09 17:43:07 +02:00
Laurent Destailleur
8c1760fbcf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-09-09 13:26:35 +02:00
Laurent Destailleur
d3f1a7d5b8 FIX Bad condition into invoice export request making reporting too many 
rows.
 2015-09-09 13:26:10 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
Juanjo Menent
7d88405058 Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 21:31:04 +02:00
Juanjo Menent
c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2015-09-08 21:08:59 +02:00
Juanjo Menent
355fcc78cf Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 20:48:31 +02:00
Florian HENRY
89b723b2a7 FIX : multientity warehouse management 2015-09-08 16:23:00 +02:00
Florian HENRY
63a817c3a4 Fix wahrehouse multientty management 2015-09-08 16:13:15 +02:00
Florian HENRY
52cb9581ff Fix multientity stock management 2015-09-08 16:00:13 +02:00
Laurent Destailleur
82ad81fc03 Fix picto 2015-09-07 20:56:28 +02:00
Laurent Destailleur
9667b6a7c6 Solve conflict of var name 2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc Fix memcached effect was lost because init was done each time. 2015-09-07 20:19:37 +02:00
Laurent Destailleur
3ae19375cd Merge pull request #3474 from aspangaro/3.8-16 
Fix Problem with checked input when you edit a survey
 2015-09-07 15:11:18 +02:00
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Laurent Destailleur
822d4d1b39 Fix remove log 2015-09-06 15:06:13 +02:00
Laurent Destailleur
aaa639a3ab Fix error when mark rate is 100% and buying price is 0, no way to 
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
 2015-09-06 15:00:17 +02:00
Laurent Destailleur
6c78b930d1 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-09-06 11:26:20 +02:00
aspangaro
e88d7076a6 Fix Problem with checked input when you edit a survey 2015-09-06 07:58:49 +02:00
aspangaro
1756862a65 Typo 2015-09-06 07:56:43 +02:00
aspangaro
a4a72d64c0 New: Accountancy Add message when general ledger is witten 2015-09-06 06:43:40 +02:00
aspangaro
b268ccf064 Fix #3455 In advanced accounting module, button transfer to general ledger don't work 2015-09-06 04:52:03 +02:00
Laurent Destailleur
8076ea85ea 3.6.4 was packaged 2015-09-05 20:07:17 +02:00
Laurent Destailleur
a21b015cbb Fix XSS 2015-09-05 20:03:02 +02:00
Laurent Destailleur
304a71710e Fix not complete info 2015-09-05 00:57:11 +02:00
Laurent Destailleur
8bea703363 Fix deadlock feature. Can't reconciliate cash bank account. Sometimes 
users need. I introduce a hidden option to fix this quickly.
 2015-09-04 23:23:39 +02:00
Laurent Destailleur
398e9bad94 Add ignore 
Conflicts:
	htdocs/.gitignore
 2015-09-04 23:22:38 +02:00
Juanjo Menent
de3f1b5559 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-09-04 18:23:33 +02:00
Juanjo Menent
ecf80249d1 Merge pull request #3454 from hregis/3.7_bug3 
Fix: problem with pagination
 2015-09-04 18:22:23 +02:00
Juanjo Menent
0016f48fac Merge pull request #3424 from atm-aurelien/3.7 
FIX ref_supplier to object property on supplier ref change
 2015-09-04 18:00:05 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Laurent Destailleur
2e3d25c055 Merge pull request #3462 from grandoc/3.7 
fix : Typo
 2015-09-03 19:15:31 +02:00
Laurent Destailleur
c7b7dff0ed Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3460

Conflicts:
	ChangeLog
 2015-09-03 19:14:37 +02:00
Laurent Destailleur
54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3383

Conflicts:
	ChangeLog
 2015-09-03 19:12:01 +02:00
Laurent Destailleur
be9d5b030d Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3358

Conflicts:
	ChangeLog
 2015-09-03 19:08:08 +02:00
Laurent Destailleur
b0f604da14 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	ChangeLog
 2015-09-03 17:05:02 +02:00
philippe grand
fed70b1376 translation missing 2015-09-03 12:57:57 +02:00
Marcos García de La Fuente
ded6e7d6d9 Merge branch '3.7' into bug-3358 
# Conflicts:
#	ChangeLog
 2015-09-03 12:32:03 +02:00
Marcos García de La Fuente
2d5331b8f8 FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice 
Close #3460
 2015-09-03 12:13:03 +02:00
philippe grand
8bf093a7ce fix : Typo 2015-09-03 12:12:10 +02:00
Marcos García de La Fuente
67b7162c59 Merge branch '3.7' into bug-3383 
# Conflicts:
#	ChangeLog
 2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29 Merge branch '3.7' into bug-incorrect-pdf-bank 
# Conflicts:
#	ChangeLog
 2015-09-03 12:03:24 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Marcos García de La Fuente
08565d46fe Merge branch '3.6' into bug-2893 2015-09-03 11:56:43 +02:00
Marcos García de La Fuente
50184babb9 FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask 
Close #2893
 2015-09-03 11:55:40 +02:00
Laurent Destailleur
ce2e5e7862 Little debug of accounting module 2015-09-03 11:54:03 +02:00
Laurent Destailleur
36ed1c9a88 Fix error management 
Fix look
 2015-09-03 11:00:53 +02:00
Laurent Destailleur
5d34f787a3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/conf.class.php
 2015-09-03 10:51:17 +02:00
Laurent Destailleur
19ac160696 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_prospect.php
	htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
	htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansextralight.z
	htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmono.z
	htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonob.z
	htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
	htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
 2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/index.php
 2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-03 10:41:44 +02:00
Laurent Destailleur
7640abe6fc Merge pull request #3453 from hregis/3.7_bug 
Fix: wrong logical operator
 2015-09-03 10:40:10 +02:00
Laurent Destailleur
cda681ac6a Merge pull request #3451 from atm-gauthier/3.8_fix_right_on_asksupplierprice 
FIX : on asksupplierprice module, order creation button must be avail…
 2015-09-03 10:36:30 +02:00
Laurent Destailleur
124f068364 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-03 10:34:39 +02:00
Laurent Destailleur
897686a752 Merge pull request #3447 from fmarcet/3.5 
FIX: The hours of date filter aren't correct
 2015-09-03 10:33:00 +02:00
Laurent Destailleur
6ea31d87f8 Merge pull request #3445 from GPCsolutions/3.7-2863 
Fix #2863 Sensible defaults for ChromePHP path
 2015-09-03 10:32:22 +02:00
Laurent Destailleur
9efecbf52b Merge pull request #3443 from GPCsolutions/3.5-3442 
Fix #3442 Remove useless syslog
 2015-09-03 10:30:42 +02:00
Laurent Destailleur
563c434fcf Fix injection 2015-09-03 09:56:33 +02:00
Laurent Destailleur
c024578ca1 Fix bad link and remove a break 2015-09-02 19:41:54 +02:00
Laurent Destailleur
e3af0b90ec Fix hidden feature to send remind by email 2015-09-02 18:09:29 +02:00
Regis Houssin
1a08f65942 Fix: problem with pagination 2015-09-02 17:22:19 +02:00
Laurent Destailleur
df3f29ee96 Fix hidden feature to send remind by email 2015-09-02 16:26:56 +02:00
Laurent Destailleur
5ef3c517bc Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-09-02 16:26:09 +02:00
Laurent Destailleur
c4fa4fc931 Fix hidden feature to send remind by email 2015-09-02 16:25:21 +02:00
Regis Houssin
fbf13ec2c7 Fix: wrong logical operator 2015-09-02 14:09:19 +02:00
Gauthier
c2c394ed8d FIX : on asksupplierprice module, order creation button must be available if user is allowed to create supplier order and not if he's allowed to create customer order 2015-09-02 11:07:30 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
a84696230b Fix the translation page must be visible for all languages, except 
en_US.
 2015-09-01 16:11:58 +02:00
Laurent Destailleur
7d4602f2c4 Fix payment mode type 2015-09-01 15:59:11 +02:00
Laurent Destailleur
7a78c9d704 Fix doxygen 2015-09-01 14:31:32 +02:00
Laurent Destailleur
03435d7d90 Fix bad error management 2015-09-01 12:36:43 +02:00
Marcos García de La Fuente
216827b1d8 FIX [ bug #3358 ] Tasks box does not work with PostgreSQL 
Close #358
 2015-09-01 11:26:59 +02:00
Marcos García de La Fuente
3134950dbe FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models 
Close #3383
 2015-09-01 11:19:05 +02:00
Marcos García de La Fuente
c4f9bde14d FIX [ bug #3431 ] Invoice bank account is not respected 
Close #3431
 2015-09-01 11:09:37 +02:00
Raphaël Doursenaud
870882257d Fix #3448 Pass expected date format 2015-09-01 11:06:44 +02:00
Marcos García de La Fuente
9ec349f410 FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it 
Close #3432
 2015-09-01 10:56:55 +02:00
Laurent Destailleur
441bb83e64 Fix url of local web sites 2015-09-01 10:08:03 +02:00
fmarcet
2b6a481011 FIX: The hours of date filter aren't correct 2015-09-01 09:46:45 +02:00
Raphaël Doursenaud
3b493ab0ed Fix #2863 Sensible defaults for ChromePHP path 
Use the provided ChromePHP class by default
 2015-08-31 21:08:37 +02:00
Raphaël Doursenaud
51d5bff15d Fix #3442 Remove useless syslog 
Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.
 2015-08-31 19:41:42 +02:00
Laurent Destailleur
9aa60e1ae1 Fix remove warning 2015-08-31 19:02:14 +02:00
Laurent Destailleur
6fd6df81ca Fix css 2015-08-31 18:01:36 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
cf3eb1e452 Fix limit of nb of project. 2015-08-31 17:01:32 +02:00
Laurent Destailleur
3a32b08512 Fix filter on opportunity status 2015-08-31 15:52:54 +02:00
Laurent Destailleur
278e90cf0a Fix same pb than #3297 with vat edit 2015-08-31 13:06:53 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Laurent Destailleur
dfde0314c6 Fix bad permission 2015-08-31 12:34:59 +02:00
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
Laurent Destailleur
31465fe899 Fix several minor bugs 2015-08-31 12:13:23 +02:00
phf
9f4ec3dbdf FIX error creating default object from empty value 2015-08-31 12:00:47 +02:00
Aurélien Stride
1a3d8b5ae4 FIX : adjusted test for affecting supplier reference 2015-08-31 09:25:39 +02:00
fmarcet
cf38b17e88 FIX: Bad visualization of suppliers name on Incomes-Expenses mode 2015-08-31 09:18:37 +02:00
Laurent Destailleur
fb70fbdc06 Merge pull request #3428 from marcosgdf/bug-3426 
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
 2015-08-31 00:53:04 +02:00
Laurent Destailleur
04d8bf7a1a Merge pull request #3427 from fappels/3.8-fix-delivery-validate 
Fix missing delivery validation button
 2015-08-31 00:51:17 +02:00
Laurent Destailleur
1decd6be12 Merge pull request #3422 from fappels/3.8 
Fix commit #3396 lot/serial shipment
 2015-08-31 00:48:25 +02:00
Laurent Destailleur
2c85cf246c Merge branch 'patch-1' of https://github.com/gschratzer/dolibarr into 
gschratzer-patch-1

Conflicts:
	htdocs/projet/element.php
 2015-08-31 00:45:18 +02:00
Laurent Destailleur
3315978fd3 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-30 21:22:28 +02:00
Laurent Destailleur
1e3bc9f822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
 2015-08-30 21:20:50 +02:00
Marcos García
e4bddb4a00 NEW Added __PROJECT_NAME__ tag for customer invoice emails 2015-08-30 13:47:02 +02:00
fappels
b908f10c5b Fix missing product label in package tab 2015-08-30 11:50:47 +02:00
Juanjo Menent
c3d3a989b3 Merge pull request #3429 from marcosgdf/patch-2 
Removed odd test
 2015-08-30 09:03:36 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-08-30 07:39:45 +02:00
Marcos García
3482031b8a Removed second odd test 2015-08-29 21:44:05 +02:00
Marcos García
8fd7f0f383 Removed odd test 2015-08-29 21:41:15 +02:00
Marcos García de La Fuente
b953d2c466 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields 
Close #3426
 2015-08-29 19:42:51 +02:00
fappels
f1be574489 correction on permissions 2015-08-29 17:14:41 +02:00
fappels
ace1681f31 Fix missing delivery validation button 
delivery advanced permissions were missing
 2015-08-29 16:52:10 +02:00
Laurent Destailleur
c8f12dc5f2 Fix PUT method for already formated strings 2015-08-29 15:12:31 +02:00
Laurent Destailleur
a3d612a26a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-08-29 13:45:47 +02:00
Laurent Destailleur
17b69e16d2 Fix remove a bad log reporting error when not 2015-08-29 13:45:23 +02:00
Laurent Destailleur
3e266243e5 Fix css for support page 2015-08-28 20:39:30 +02:00
Laurent Destailleur
a98985bf37 Fix align 2015-08-28 20:17:36 +02:00
Laurent Destailleur
47ea834516 Fix debug module expense report 2015-08-28 20:11:16 +02:00
Laurent Destailleur
4377a2d013 Fix style and sql error for field fde.ref not found 2015-08-28 18:20:51 +02:00
Aurélien Stride
e2072999cf ADD : ref_supplier to object property, otherwise not visibly updated on change 2015-08-28 17:12:27 +02:00
Juanjo Menent
25fca6615a Merge pull request #3395 from fmarcet/develop 
NEW: Translate extrafield's labels
 2015-08-28 16:44:49 +02:00
Juanjo Menent
c09b130644 Merge pull request #3403 from defrance/patch-76 
NEW add in get_origin function generic origintype
 2015-08-28 16:28:59 +02:00
Juanjo Menent
b058d39bb4 Merge pull request #3419 from aspangaro/develop-61 
Increase length of column pcg_version to 32 for accountancy system
 2015-08-28 16:26:26 +02:00
Juanjo Menent
4e1aec16b8 Merge pull request #3416 from GPCsolutions/3.8-3218 
Fix #3218 Bank date selectors presentation
 2015-08-28 16:20:50 +02:00
Juanjo Menent
f6074d3017 Merge pull request #3417 from GPCsolutions/3.8-3219 
Fix #3219 More conventional presentation
 2015-08-28 16:20:34 +02:00
Juanjo Menent
3feeaf7294 Merge pull request #3415 from GPCsolutions/3.8-2571-suppliers 
Added tags/categories management to suppliers
 2015-08-28 16:18:28 +02:00
Juanjo Menent
a7d1a35a56 Merge pull request #3420 from aspangaro/3.7-4 
Fix #3289 Salaries module shows amounts with currency symbol unlike t…
 2015-08-28 16:12:36 +02:00
Laurent Destailleur
6624182361 Fix form outside table 2015-08-28 00:29:46 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
Laurent Destailleur
aec3976741 Fix set ref 2015-08-27 22:48:52 +02:00
Laurent Destailleur
302b61c5ce Fix Can't download generated document for cheque summary deposit. 2015-08-27 22:43:09 +02:00
fappels
6d02c48c49 Fix batch expedition 2015-08-27 19:52:43 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
aspangaro
aff134ab65 Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr 2015-08-27 16:10:02 +02:00
aspangaro
134bd42c4e Increase length of column pcg_version to 32 2015-08-27 15:13:29 +02:00
philippe grand
e9f631d2e3 fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:49:12 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'" 
This reverts commit 2527ae263b.
 2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
Juanjo Menent
ddb9c6a025 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 21:01:39 +02:00
Juanjo Menent
0a33f0728a Fix translations of contract exports 2015-08-26 21:01:01 +02:00
Juanjo Menent
4cd61073e2 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 20:26:27 +02:00
Juanjo Menent
6321e96e49 Close #3223 2015-08-26 20:25:52 +02:00
Raphaël Doursenaud
ba1ad9f317 Fix #3219 More conventional presentation 2015-08-26 19:51:06 +02:00
Raphaël Doursenaud
33ea968b5b Fix #3218 Bank date selectors presentation 2015-08-26 19:45:32 +02:00
Raphaël Doursenaud
cea47f3e25 Added tags/categories management to suppliers 
Suppliers part of #2571
 2015-08-26 19:30:55 +02:00
Guido Schratzer
154f6cff9f Fix: htdocs/projet/element.php Logoposition 
Fixed Logo from center to right
set table width to 100 %
 2015-08-26 18:35:15 +02:00
Laurent Destailleur
603c44c37c Merge pull request #3405 from aspangaro/3.8-13 
Fast review 3.8
 2015-08-26 11:27:16 +02:00
Laurent Destailleur
0a880cd205 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-26 11:26:00 +02:00