Commit Graph

52548 Commits

Author SHA1 Message Date
Laurent Destailleur
ecf47109c0 Merge pull request #4739 from marcosgdf/accountline-oop
NEW Created AccountLine::insert function and started using it for transaction creation
2016-03-10 13:55:07 +01:00
Laurent Destailleur
79989c2f65 Merge pull request #4741 from marcosgdf/account-oop-properties
Fixed wrong Account class property used in bank/card.php
2016-03-10 13:53:17 +01:00
Laurent Destailleur
3d131de35c Merge pull request #4778 from marcosgdf/bug-4777
FIX #4777 Error creating thirdparty with PostgreSQL
2016-03-10 13:34:34 +01:00
Laurent Destailleur
21bf8824b9 Merge pull request #4738 from marcosgdf/account-libstatut
Refactored Account::libStatut and added object typehinting to some functions of Account class
2016-03-10 13:29:02 +01:00
Laurent Destailleur
216ca713f2 Merge pull request #4765 from defrance/patch-108
FIX : Error travis fail (bad comment)
2016-03-10 13:23:14 +01:00
Laurent Destailleur
155fd71f6d Merge pull request #4734 from fappels/develop
Fix: add require to showDimensionInBestUnit
2016-03-10 13:22:58 +01:00
Laurent Destailleur
4fa84c8d8f Merge pull request #4707 from marcosgdf/misc2
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-10 13:21:51 +01:00
Laurent Destailleur
a12d81cbda Fix PHPCS 2016-03-10 12:36:25 +01:00
Laurent Destailleur
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass
actions" feature.
2016-03-10 12:11:11 +01:00
Laurent Destailleur
d0441fa05f NEW: Show into badge on tab head the number of dedicated contacts for
objects.
2016-03-10 11:16:12 +01:00
Laurent Destailleur
ba5b0efb53 The warning for late orders is visible on order card 2016-03-10 10:53:01 +01:00
Laurent Destailleur
e0681d0165 Fix unit not visible if not defined 2016-03-09 23:20:44 +01:00
Laurent Destailleur
8ab343e95f Can choose number of decimals into function showDimensionInBestUnit 2016-03-09 23:17:46 +01:00
Marcos García de La Fuente
199597f93a FIX #4777 Error creating thirdparty with PostgreSQL
Close #4777
2016-03-09 14:46:09 +01:00
Laurent Destailleur
4b0b1fb5f6 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/societe/consumption.php
2016-03-08 20:29:10 +01:00
Laurent Destailleur
e0cef69685 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-08 20:21:42 +01:00
Laurent Destailleur
9f3f477877 FIX Navigation in result 2016-03-08 20:21:16 +01:00
Laurent Destailleur
881eca9fe5 Fix search on product ref 2016-03-08 19:46:42 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Laurent Destailleur
6d9bec9de1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-08 17:32:00 +01:00
Laurent Destailleur
71246c864a FIX Bad td balance and default checkbox value 2016-03-08 17:31:46 +01:00
Laurent Destailleur
a6fcab96e3 Better contrast in thumb of demo page 2016-03-08 10:03:51 +01:00
BENKE Charlie
1d60ec0145 Error travis fail (bad comment) 2016-03-07 18:31:03 +01:00
Marcos García de La Fuente
08d27b7148 Refactored Account::LibStatut function 2016-03-07 11:31:16 +01:00
Marcos García de La Fuente
66f71d16d9 Fixed wrong Account class property used in bank/card.php 2016-03-06 19:59:37 +01:00
Juanjo Menent
9865b0daa3 Merge pull request #4735 from aspangaro/3.9-p16
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-06 14:46:24 +01:00
Laurent Destailleur
894953c275 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-06 12:40:11 +01:00
Laurent Destailleur
3dbe27030e FIX If all banks account are reconcilable to off, we must not show nb of
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
2016-03-06 12:39:59 +01:00
Marcos García de La Fuente
ed51a42963 NEW Created AccountLine::insert function and started using it for transaction creation 2016-03-05 16:26:30 +01:00
Marcos García de La Fuente
4f569279d6 Refactored Account::libStatut and added object typehinting to some functions of Account class 2016-03-05 16:14:41 +01:00
Laurent Destailleur
c007dcc966 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:02:13 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Marcos García de La Fuente
6184c71181 Corrected comparison of Account::canBeConciliated output 2016-03-05 14:05:00 +01:00
Laurent Destailleur
d8045e33bb FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to
edit email templates
2016-03-05 12:37:09 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
fappels
61bd7b330f Revert "Update commande.class.php"
This reverts commit 266f1e2acd.
2016-03-05 11:44:35 +01:00
Laurent Destailleur
15ecf98bcb Fix responsive on smartphone 2016-03-05 02:11:20 +01:00
Laurent Destailleur
7a1af17585 FIX Responsive of demo selection page was not working 2016-03-05 01:40:52 +01:00
Laurent Destailleur
90ce3e6309 FIX Responsive of demo selection page was not working 2016-03-05 01:39:22 +01:00
Laurent Destailleur
144c410b52 Add var commented into conf file
Fix disabled of module for demo
2016-03-05 01:38:14 +01:00
Laurent Destailleur
74f9ed029c Code comment 2016-03-05 01:37:05 +01:00
Laurent Destailleur
66a95be78a custom dir seems stable enough to be on by default. 2016-03-05 00:09:08 +01:00
aspangaro
ae472b932c Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account 2016-03-04 20:45:47 +01:00
Francis Appels
266f1e2acd Update commande.class.php
subprice should be pu without tax
2016-03-04 20:02:03 +01:00
Francis Appels
0890f20a72 Update functions.lib.php
Add product.lib for function measuring_units_string
2016-03-04 19:29:08 +01:00
Laurent Destailleur
109eefaf03 Merge pull request #4723 from IonAgorria/default-date-selector
New: Default values in date selector
2016-03-04 16:31:42 +01:00
Laurent Destailleur
cbd102fa45 Merge and rename method into camel format 2016-03-04 16:28:38 +01:00
Laurent Destailleur
6e8b176d8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-04 16:24:03 +01:00
Laurent Destailleur
87093c79f9 Merge pull request #4708 from marcosgdf/account-constants
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
0f9afea1cc Merge pull request #4731 from IonAgorria/unset-date-post
Fix: unset date start/end at success
2016-03-04 16:20:10 +01:00