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

56461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c907ca85c9 Fix css 2016-03-08 20:32:41 +01:00
Laurent Destailleur
043abdce03 Fix sql error 2016-03-08 20:30: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
Marcos García de La Fuente
d43d0bfec1 Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation 2016-03-08 12:16:32 +01:00
Florian HENRY
4bf2da4af7 revert SQL changes 2016-03-08 10:24:59 +01:00
Florian HENRY
a8e2b49c5b FIX : #4768 2016-03-08 10:22:31 +01:00
Laurent Destailleur
a6fcab96e3 Better contrast in thumb of demo page 2016-03-08 10:03:51 +01:00
philippe grand
44d71c2bb4 fix : missing translation 2016-03-08 09:08:31 +01:00
BENKE Charlie
1d60ec0145 Error travis fail (bad comment) 2016-03-07 18:31:03 +01:00
Benlo
0166d2ec3a FR4763 add possibility to export contacts/thirdparty categories 2016-03-07 17:49:26 +01:00
Marcos García de La Fuente
08d27b7148 Refactored Account::LibStatut function 2016-03-07 11:31:16 +01:00
Florian HENRY
002a3888f4 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-07 10:57:46 +01:00
BENKE Charlie
e455a2c9a8 only enabled society is used for product select 2016-03-07 08:25:21 +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
Juanjo Menent
7a65ebe2b4 Merge pull request #4733 from grandoc/3.8 
3.8
 2016-03-06 14:45:48 +01:00
Juanjo Menent
5fb6db9da3 Merge pull request #4732 from hregis/3.8_bug 
Fix: compatibility with multicompany transversal mode
 2016-03-06 14:45:21 +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
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