Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,062 Commits 36 Branches 190 Tags
2c7029850aadb9106ee5341f11f079dda48c0fd6
Commit Graph

5858 Commits

Author SHA1 Message Date
patrick Delcroix
adda3144bc Fix Show double(x,y) fields 2018-05-26 23:39:36 +02:00
Laurent Destailleur
10281169e6 Empty page first 2018-05-25 15:43:08 +02:00
Laurent Destailleur
b246034670 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 14:57:43 +02:00
Laurent Destailleur
823936ef87 Merge pull request #8847 from frederic34/multipriceqty 
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
 2018-05-25 12:55:02 +02:00
Laurent Destailleur
bcbe28d802 Code comment 2018-05-25 12:48:33 +02:00
Laurent Destailleur
f3713844ee Update commonobject.class.php 2018-05-25 12:38:01 +02:00
Laurent Destailleur
770e97431b Update commonobject.class.php 2018-05-25 12:36:38 +02:00
Laurent Destailleur
86b1904a41 Update commonobject.class.php 2018-05-25 12:33:30 +02:00
Laurent Destailleur
aa65b3f9ba Merge pull request #8830 from wdammak/patch-8 
Add liste_modeles to warehouse module
 2018-05-25 11:43:48 +02:00
Laurent Destailleur
3d71ce8297 Update html.formfile.class.php 2018-05-25 11:19:38 +02:00
Laurent Destailleur
520ce99e56 Merge pull request #8828 from bgenere/develop 
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
 2018-05-25 11:17:45 +02:00
Laurent Destailleur
a3bea8d298 Update commonobject.class.php 2018-05-25 11:17:01 +02:00
Laurent Destailleur
22b1f2574e Merge pull request #8851 from atm-florian/develop 
fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined
 2018-05-25 11:07:18 +02:00
Laurent Destailleur
ac0570f6b2 Update translate.class.php 2018-05-25 11:07:11 +02:00
Laurent Destailleur
fbcaf8872b Merge pull request #8808 from atm-john/Add_table_thead_and_tbody 
Add table thead and tbody for object lines
 2018-05-25 10:42:26 +02:00
delcroix Patrick
3158fdc551 Update commonobject.class.php 2018-05-24 21:20:34 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
florian HENRY
436a1001b3 fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL 
on upgrade.php page where global is not yet defined
 2018-05-24 10:56:01 +02:00
Frédéric FRANCE
8547827575 Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54 PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
delcroix Patrick
c85d216f8e Merge branch 'develop' into patch-modulebuilder-supportsellist 2018-05-22 22:24:20 +02:00
patrick Delcroix
29d26b6e89 New: support sellist in modulebuilder 2018-05-22 22:16:25 +02:00
patrick Delcroix
2ccaf1ad95 New: support sellist in modulebuilder 2018-05-22 22:00:20 +02:00
Laurent Destailleur
354198b31e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/contact.php
 2018-05-22 20:26:09 +02:00
Laurent Destailleur
f074daae48 Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT 2018-05-22 20:17:31 +02:00
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
BENKE Charlene
4bebc8149b Update html.formcontract.class.php 2018-05-13 21:17:15 +02:00
BENKE Charlene
f4af9ec22f Update html.formcontract.class.php 2018-05-13 19:38:30 +02:00
BENKE Charlene
b0757916c4 Update html.formcontract.class.php 2018-05-13 16:59:03 +02:00
BENKE Charlene
2f1800f3e2 Update html.formprojet.class.php 2018-05-13 15:34:26 +02:00
BENKE Charlene
537048a10a Update html.formcontract.class.php 2018-05-13 15:30:32 +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