Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,805 Commits 36 Branches 189 Tags
063e589a1b6985cdca59e4a8eff16e68a6fa8093
Commit Graph

5928 Commits

Author SHA1 Message Date
Laurent Destailleur
2a579b707a FIX javascript showempty error 
FIX Contact tab not visible when using canvas
 2018-05-22 19:43:28 +02:00
wdammak
1f43882bb7 Add liste_modeles to warehouse module 2018-05-22 01:09:52 +01:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
bgenere
227539d647 FIX : showOptionals function is now consistent with template 
Extrafield_view.tpl.php for date and datetime fields

The jdate function is not called when not needed.
 2018-05-21 16:55:35 +02:00
Laurent Destailleur
6d0306f75a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-05-18 11:52:48 +02:00
Laurent Destailleur
492b1e7169 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:08 +02:00
Laurent Destailleur
e724cfd6a2 Merge pull request #8802 from atm-john/new_avoir_situation 
Add credit note compatibility with situation invoice.
 2018-05-18 11:34:10 +02:00
Laurent Destailleur
a279451241 Fix can use actionmsg for generic trigger 2018-05-17 17:58:29 +02:00
John
8710cf570d Add table thead and tbody for object lines 2018-05-17 16:52:16 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
Laurent Destailleur
ad32b3098a Too verbose log 2018-05-16 10:31:44 +02:00
Laurent Destailleur
a2d485c14f Fix management of enabled property extrafields 2018-05-13 14:27:40 +02:00
Laurent Destailleur
302d9399e2 Fix search when using special char 2018-05-13 12:42:16 +02:00
Laurent Destailleur
53b5733fb4 Fix test 2018-05-12 13:40:53 +02:00
Laurent Destailleur
ee11a46a66 Merge pull request #8766 from fmarcet/develop 
NEW Add Date delivery and Availability on Propals List
 2018-05-10 12:18:27 +02:00
Laurent Destailleur
d020741173 Merge pull request #8757 from bafbes/abb7004 
New : Translate list elements in journal selection
 2018-05-10 12:15:34 +02:00
Laurent Destailleur
0bf1fe2908 Merge pull request #8753 from delcroip/patch-15 
new: log message for missing translation
 2018-05-10 11:56:56 +02:00
Laurent Destailleur
f476e3e304 Update translate.class.php 2018-05-10 11:56:49 +02:00
Laurent Destailleur
842c6168a2 FIX #8762 2018-05-10 11:50:35 +02:00
Laurent Destailleur
56b80d81dd Declare hook as addreplace hook 2018-05-10 11:39:29 +02:00
Ferran Marcet
70527e64c5 New: Add Date delivery and Availability on Propals List 2018-05-08 18:15:02 +02:00
Abbes Bahfir
fd9b6365a7 New : Translate list element in journal selection 2018-05-07 09:20:19 +01:00
delcroix Patrick
5ac2b51517 new: log message for missing traduction 
It's often difficult to find out the missing translation
 2018-05-06 17:29:30 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
Laurent Destailleur
cb76d2ce0f Better logging 2018-05-01 18:58:19 +02:00
florian HENRY
b5d7206519 fix 6.0 accountancy multientity 2018-05-01 12:02:33 +02:00
Laurent Destailleur
d975dd507b Revert "No display object line curreny if not necessary" 2018-05-01 11:17:47 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
4c12369a26 Debug module ticket 2018-04-30 10:33:36 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
659fd46b76 Merge pull request #8653 from ATM-Marc/NEW_commonObject_array 
NEW: work on CommonObject 'array' field typeNew common object array
 2018-04-27 09:39:26 +02:00
Laurent Destailleur
36616cdd50 FIX When time is entered without hour, edit keeps this 2018-04-26 10:07:27 +02:00
Laurent Destailleur
21a18da43b We can disable the "favorites" in select combo of countries 2018-04-25 21:06:51 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
florian HENRY
67329b8805 fix commonobject double style 2018-04-24 12:33:07 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2018-04-23 23:09:53 +02:00
Laurent Destailleur
fdb3a11f34 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:53:57 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Philippe GRAND
410d1ee07d Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 12:05:50 +02:00
Laurent Destailleur
cca4b1cbf5 NEW Optimize load of hooks classes (save 1-5Kb of memory) 2018-04-21 11:24:45 +02:00