Commit Graph

54672 Commits

Author SHA1 Message Date
Laurent Destailleur
00a658143d NEW List of user in agenda view per user show photo thumb 2016-04-23 16:51:22 +02:00
Maxime Kohlhaas
179022b129 Fix country and state were not properly updated after ziptown selection 2016-04-23 16:49:43 +02:00
aspangaro
c652d5b02d NEW: Loan - Add list to select accounting account in admin 2016-04-23 16:06:33 +02:00
Maxime Kohlhaas
c5787a4bba New add remain to pay column in invoice list (was present in previous versions) 2016-04-23 16:02:18 +02:00
aspangaro
1454f5cafa FIX: Accountancy - Table account integer 0 by default 2016-04-23 15:44:31 +02:00
aspangaro
04fd5a20ef FIX: Accountancy Work on categories for Report - Add french example 2016-04-23 15:43:28 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture
change before the freeze)
2016-04-23 15:37:22 +02:00
Marcos García de La Fuente
d98e50e661 Little change 2016-04-23 13:44:43 +02:00
Marcos García de La Fuente
867649e922 FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
Close #4813
2016-04-23 13:36:12 +02:00
Marcos García de La Fuente
f195107bd1 Fixed undefined $user variable in Account::countAccountToReconcile 2016-04-23 13:25:23 +02:00
Maxime Kohlhaas
4e42e73f60 New add stats on interventions 2016-04-23 13:16:19 +02:00
Maxime Kohlhaas
df4d016684 New add stats on contacts 2016-04-23 13:06:46 +02:00
aspangaro
2a7c7a0748 Same problem on bank 2016-04-23 08:09:38 +02:00
aspangaro
8f9c3f96cf Merge remote-tracking branch 'Upstream/develop' into 4.0-p21 2016-04-23 07:07:15 +02:00
aspangaro
a8aeba3ade FIX: For external api, don't use lengt_accountg without module accountancy activated 2016-04-23 07:05:16 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
3278c8245b Merge pull request #5020 from frederic34/swiftmailer
Add Swift Mailer to send mails
2016-04-22 20:12:58 +02:00
Laurent Destailleur
f96f8eac85 Merge remote-tracking branch 'origin/3.8' into 3.9 3.9.1 2016-04-22 20:09:51 +02:00
Laurent Destailleur
980f3d522f Prepare 3.9.1 2016-04-22 20:09:42 +02:00
Laurent Destailleur
25810ddfc8 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
	htdocs/core/lib/tax.lib.php
2016-04-22 20:08:33 +02:00
Laurent Destailleur
68e96b98c5 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2016-04-22 20:02:34 +02:00
Laurent Destailleur
361bba4eb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 20:01:14 +02:00
Laurent Destailleur
051c5f415e Fix API access protection check #5053 2016-04-22 20:00:37 +02:00
Laurent Destailleur
284622edbd Merge pull request #5062 from bafbes/abb-18
fix:missing quote in query in commonobject updatefield function
2016-04-22 19:51:11 +02:00
Laurent Destailleur
7f5670cb26 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	ChangeLog
2016-04-22 19:49:27 +02:00
Laurent Destailleur
3d4ddcb29e Merge pull request #5065 from atm-maxime/fix_supplier_order_log
Fix log function was removed in 1b6fa8ec34
2016-04-22 19:45:36 +02:00
Laurent Destailleur
d2003e9607 Merge pull request #5058 from philippe-opendsi/patch-2
FIX #5048 Product supplier list display only one product
2016-04-22 19:44:16 +02:00
Laurent Destailleur
230807b292 Merge pull request #5056 from frederic34/patch-10
FIX If oauth has never been activated two tables are missing and printing is not working
2016-04-22 19:42:21 +02:00
Laurent Destailleur
7e047ada2b Merge pull request #5064 from aspangaro/4.0-p21
FIX: Accountancy - Road to stable version
2016-04-22 19:21:18 +02:00
Laurent Destailleur
63d04f4f2d Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client
Fix order creation bug because of ->client
2016-04-22 19:20:48 +02:00
Laurent Destailleur
fb53b41078 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 19:20:04 +02:00
Laurent Destailleur
da14f247bb Merge pull request #5070 from atm-maxime/fix_display_payment_on_invoices
Fix payment display on customer invoice and replicate on supplier inv…
2016-04-22 19:19:46 +02:00
Laurent Destailleur
031bcb41e3 Merge pull request #5073 from atm-maxime/fix_menu_bank
Fix bank submenu error
2016-04-22 19:13:53 +02:00
Laurent Destailleur
ec407af81a Merge pull request #5072 from atm-maxime/fix_bank_releve_display
Fix bank statement display
2016-04-22 19:12:56 +02:00
Laurent Destailleur
bcc0f0c488 Merge pull request #5067 from grandoc/develop
Fix : missing translation
2016-04-22 19:12:36 +02:00
Laurent Destailleur
4958c13691 Merge pull request #5069 from atm-maxime/new_contact_gender
New contact gender according to civility
2016-04-22 19:11:54 +02:00
Laurent Destailleur
0a55534da8 Merge pull request #5059 from frederic34/patch-7
Update 3.9.0-4.0.0.sql
2016-04-22 19:08:04 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
467662143f Merge pull request #5046 from bafbes/abb-17
fix:use of function updateExtrafield instead of insertExtrafields in interventions
2016-04-22 18:31:14 +02:00
Laurent Destailleur
1de36d6501 Merge pull request #5011 from altatof/supplierorder_noprice
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-04-22 18:27:42 +02:00
Laurent Destailleur
241e765829 Merge pull request #5047 from hregis/3.9_bug
Fix: broken multicompany transverse mode authentication feature
2016-04-22 18:24:17 +02:00
Laurent Destailleur
a99b7ddee6 Fix PHPCS 2016-04-22 18:12:31 +02:00
Laurent Destailleur
0ef1be9364 Prepare 3.9.1 2016-04-22 18:07:34 +02:00
Laurent Destailleur
25b7f0ab62 FIX Remove a total that has no sense 2016-04-22 17:11:12 +02:00
Laurent Destailleur
2cc24db6a2 Fix typo 2016-04-22 13:45:54 +02:00
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
366db31a9e Make css more simple 2016-04-22 13:38:44 +02:00
Laurent Destailleur
7515b2ba7b NEW Add a parameter on graph function to show a generic graph when no
data are available.
2016-04-22 12:11:57 +02:00
Maxime Kohlhaas
72ef11f593 Fix bank submenu error 2016-04-22 11:59:55 +02:00
Maxime Kohlhaas
5904f33039 Fix bank statement display 2016-04-22 11:44:23 +02:00