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

65064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabeltran
604cc5896e FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php 
Column 'amount_requested' in ORDER clause not exists because that column is called 'amount' now in 'prelevement_bons' table in db.
 2018-02-26 12:31:40 +01:00
Laurent Destailleur
46c2f098e0 NEW Can enter time spent from the list of time spent of project 2018-02-26 12:21:01 +01:00
Regis Houssin
1aa1b0a3ea Fix: avoid warning during "upgrade2" process 2018-02-26 12:15:30 +01:00
Laurent Destailleur
d1e846385a FIX Useless clean of tree 2018-02-26 12:01:36 +01:00
Laurent Destailleur
46f70ebf8e FIX Useless clean of tree 2018-02-26 12:01:13 +01:00
Laurent Destailleur
0d12552445 NEW Can enter time spent from the list of time spent of project 2018-02-26 11:57:29 +01:00
Regis Houssin
365fffddf5 Fix: missing object entity 2018-02-26 11:35:44 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
667c9045a2 FIX duplicate confirm message. Missing reposition class 2018-02-26 10:33:39 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency 2018-02-26 09:54:09 +01:00
Laurent Destailleur
4866d63ece Fix method getListOfPayments in the wrong class 2018-02-26 09:45:15 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
1666f371bf css 2018-02-26 00:13:16 +01:00
Regis Houssin
ef60d095c0 Fix: syntax error 2018-02-25 19:55:10 +01:00
guillaume-uH57J9
d8a0cb7387
install, don't use innodb engine for pgsql 2018-02-25 19:43:53 +01:00
Regis Houssin
60525b9c18 Fix: multicompany transverse mode is managed by the module 2018-02-25 15:35:41 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
7ff94c88bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 15:00:31 +01:00
Laurent Destailleur
251136bebf Fix PHPUnit 2018-02-25 15:00:14 +01:00
Laurent Destailleur
b52a2b12a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 14:44:49 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Laurent Destailleur
1f60d9ba81 Fix travis 2018-02-25 13:14:55 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity 
FIX missing object entity in fetch
 2018-02-25 12:59:38 +01:00
Laurent Destailleur
68e0283fe4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 12:58:32 +01:00
Laurent Destailleur
0a571a0677 Complete fix #8230 2018-02-25 12:58:17 +01:00
Laurent Destailleur
0262b64eb1
Merge pull request #8230 from hregis/7.0_bug4 
Fix: missing hook parameters
 2018-02-25 12:56:43 +01:00
Laurent Destailleur
898f2cf0ca
Merge pull request #8229 from hregis/7.0_bug3 
FIX Parameter must be an array or an object that implements Countable
 2018-02-25 12:55:54 +01:00
Laurent Destailleur
7dfedbf35c
Merge pull request #8228 from hregis/7.0_bug 
FIX Use of undefined constant _ROWS_2
 2018-02-25 12:55:17 +01:00
Laurent Destailleur
6c16f2af1e
Merge pull request #8226 from hregis/7.0_multicompany 
Fix: differentiate sharing of "member" and "member_type"
 2018-02-25 12:54:51 +01:00
Laurent Destailleur
4581d6049c
Update societecontact.php 2018-02-25 12:52:39 +01:00
Laurent Destailleur
64dd6439e7
Merge pull request #8223 from atm-florian/6.0 
fix bad link invoice URL into acoutantcy customer affectation
 2018-02-25 12:42:03 +01:00
Laurent Destailleur
8dceb8930f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/user/card.php
 2018-02-25 12:41:17 +01:00
Laurent Destailleur
286d62edb8
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns 
FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
 2018-02-25 12:35:05 +01:00
Laurent Destailleur
d51355517b
Merge pull request #8216 from dolibarr95/patch-39 
NEW Can dispatch if more than ordered (if hidden option set)
 2018-02-25 12:30:32 +01:00
Rui Strecht
7b448a2d18 Fixed issue with elementarray null if num_rows = 0 2018-02-25 12:29:15 +01:00
Laurent Destailleur
2472dd4d99
Merge pull request #8214 from ruistrecht-alt/FIX_projet_elementarray_null 
Fix issue with project.class.php elementarray null if num_rows = 0
 2018-02-25 12:28:48 +01:00
Laurent Destailleur
c698558d9e
Merge pull request #8212 from simnandez/6.0 
Fix: Not showing link to ad event if module is disabled
 2018-02-25 12:28:06 +01:00
Laurent Destailleur
b20ae45265
Merge pull request #8210 from atm-john/fix_sql_entity 
Fix sql entity for sub query
 2018-02-25 12:27:35 +01:00
Laurent Destailleur
037094cd65 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 12:21:43 +01:00
Laurent Destailleur
6a78ce65e9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/imports/import.php
 2018-02-25 12:21:10 +01:00
Laurent Destailleur
2d252e85e6 FIX Import process must stop after ending line nb to import 2018-02-25 12:15:36 +01:00
Laurent Destailleur
dd204947b8 CSS 2018-02-25 11:00:50 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Laurent Destailleur
c604ce0a06 Fix date in odt 2018-02-24 15:31:30 +01:00
Regis Houssin
b216249214 Fix: missing hook parameters 2018-02-24 15:01:29 +01:00
Laurent Destailleur
3b5a3915c4 NEW Use common substitution rule for language to get translation in ODT 2018-02-24 14:23:52 +01:00
Regis Houssin
3859b5a926 Fix: Parameter must be an array or an object that implements Countable 2018-02-24 14:20:53 +01:00
Laurent Destailleur
a5b1f114c2 FIX Generic substitution of constant disabled for sensitive constant 2018-02-24 14:03:32 +01:00
Laurent Destailleur
619e0d3792 FIX Bad var for substitution of free text 2018-02-24 14:03:27 +01:00