Commit Graph

52840 Commits

Author SHA1 Message Date
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
Laurent Destailleur
896f60a478 hidden solution to solve files overwriting each other 2016-03-06 00:47:00 +01:00
Laurent Destailleur
886aa1f8b6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-06 00:39:25 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included
with a . instead of -. This make os think it is part of extension
instead of file name.
2016-03-06 00:39:13 +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
Marcos García de La Fuente
0fd9518ad0 NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
Also replaced spaces with tabs and applied PSR-2 beautifier to the code
2016-03-05 15:51:02 +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
Regis Houssin
5292920a84 Fix: don't see the sales representative of anothers entities 2016-03-04 17:10:42 +01:00
Regis Houssin
735a1c075e Fix: best sql request 2016-03-04 16:48:53 +01:00
philippe grand
8ba8182c64 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-03-04 16:32:33 +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
philippe grand
bd0320dea0 fix : missing traduction 2016-03-04 16:30:47 +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
Laurent Destailleur
c940d2de60 Merge pull request #4729 from IonAgorria/fix-dynprice-supplier
Fix: dynamic price parser and button not using selected expression
2016-03-04 16:19:41 +01:00
Laurent Destailleur
a73b53ff9c Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
2016-03-04 16:18:15 +01:00
Laurent Destailleur
4ae3fe6318 Merge pull request #4726 from atm-maxime/develop
New : add button to create event on supplier order or invoice
2016-03-04 16:17:38 +01:00
Laurent Destailleur
83ababeeac Merge pull request #4727 from hregis/3.8_fichinter
Fix: wrong modelpdf var name
2016-03-04 16:17:16 +01:00
Laurent Destailleur
fe13fe06ac Merge pull request #4724 from frederic34/patch-7
Update html.formfile.class.php
2016-03-04 16:15:53 +01:00
Laurent Destailleur
36474eabec NEW Add stats and late records into dashboard for supplier proposals. 2016-03-04 16:14:23 +01:00
Laurent Destailleur
c63ee8ceb5 Debug module supplier proposal 2016-03-04 16:08:51 +01:00
Regis Houssin
967ae720ef Fix: compatibility with multicompany transversal mode 2016-03-04 15:51:34 +01:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
ca1860a08b Merge pull request #4720 from hregis/3.8_bug
Fix: compatibility with multicompany transversal mode and more security issue
2016-03-04 15:34:24 +01:00
Laurent Destailleur
cb7ae31c65 Merge pull request #4722 from grandoc/develop
fix : missing translation
2016-03-04 15:31:42 +01:00
Laurent Destailleur
fcb8c09414 Merge pull request #4721 from grandoc/3.9
fix : missing translation
2016-03-04 15:31:35 +01:00
Laurent Destailleur
4ea00fe1c5 Merge pull request #4725 from aspangaro/3.9-p15
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-04 15:31:25 +01:00
Laurent Destailleur
c00860fdd5 Merge pull request #4719 from hregis/3.9_holiday
Fix: best compatibility with multicompany and others security issue
2016-03-04 15:30:18 +01:00
Laurent Destailleur
b6fd2a665e Merge pull request #4718 from grandoc/3.8
fix : missing translation
2016-03-04 15:22:04 +01:00
Laurent Destailleur
e92318bc13 Better fix to manage several level of beta and rc 2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919 Merge pull request #4710 from hregis/3.9_bug
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-04 15:18:59 +01:00
Laurent Destailleur
9ffaf9b218 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-03-04 14:51:59 +01:00
Laurent Destailleur
e7511dd267 Fix consistency into data for time spent on tasks 2016-03-04 14:27:05 +01:00