Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

12820 Commits

Author SHA1 Message Date
Laurent Destailleur
e2bb04dcae Fix debug modulebuilder for doc and ref generation 2020-05-31 22:59:33 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
8146e4fdbd Fix tooltip 2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8 Debug module Payment by credit transfer 2020-05-30 02:10:02 +02:00
Laurent Destailleur
926a9f68c4 Trans 2020-05-30 00:23:14 +02:00
Laurent Destailleur
30aa50684f Trans 2020-05-29 21:47:59 +02:00
Laurent Destailleur
9d2f67bf8c Trans 2020-05-29 16:35:01 +02:00
Laurent Destailleur
91f5f8053a Fix label 2020-05-29 13:46:27 +02:00
Laurent Destailleur
f38118790e Trans 2020-05-29 12:18:47 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9 Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse- 
NEW Add option to define a default warehouse at user level
 2020-05-28 18:41:54 +02:00
Laurent Destailleur
a92e952960 Merge branch 'NewVendorInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:32:52 +02:00
Laurent Destailleur
1e76101c41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 18:30:32 +02:00
Laurent Destailleur
791d147992 Merge branch 'NewCustomerInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:29:59 +02:00
Laurent Destailleur
2f0a5b2634 Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message 
NEW Ticket message notifications when edited from public interface
 2020-05-28 17:31:26 +02:00
Laurent Destailleur
88475025af Trans 2020-05-28 12:04:52 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Anthony Berton
9efcc631d7 Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00
Laurent Destailleur
0ea8d9f651 Update products.lang 2020-05-26 00:35:01 +02:00
Laurent Destailleur
80ace3b52c Revert due to regressions 2020-05-25 23:05:29 +02:00
Laurent Destailleur
26eab1f285 Merge pull request #13782 from frederic34/free_email 
NEW enable free emails input with select2
 2020-05-25 22:55:36 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Laurent Destailleur
c843da5272 Sync transifex 2020-05-23 22:29:45 +02:00
Frédéric FRANCE
a7e0fe24ff Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-23 21:44:14 +02:00
Laurent Destailleur
394ea5075f Merge pull request #13823 from aspangaro/12.0_a25 
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
 2020-05-23 15:07:27 +02:00
Laurent Destailleur
c2b2e17b58 Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl 
NEW conf to allow show full arbo in warehouse getnomurl
 2020-05-23 15:05:08 +02:00
Laurent Destailleur
5bbbabf653 Update stocks.lang 2020-05-23 15:04:59 +02:00
Laurent Destailleur
abe7472ee5 Update stocks.lang 2020-05-23 15:03:57 +02:00
Laurent Destailleur
4e3fbb9d05 Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent 
NEW mass-actions for the event list view
 2020-05-23 14:26:51 +02:00
Laurent Destailleur
333ae9d496 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 12:58:18 +02:00
Laurent Destailleur
aff2872fc1 Fix RSS 2020-05-23 12:57:58 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
Laurent Destailleur
43103f40a5 Fix make page of categories of web site working 2020-05-22 00:55:34 +02:00
Laurent Destailleur
e81e4032f7 Fix make page of categories of web site working 2020-05-22 00:54:53 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00
Laurent Destailleur
a78bc86465 Trans 2020-05-20 23:51:46 +02:00
Laurent Destailleur
e1e5d12524 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:23:17 +02:00
Laurent Destailleur
c4d1db263c Fix end of workflow of MO 2020-05-20 23:15:18 +02:00
Laurent Destailleur
954d928467 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 20:11:13 +02:00