Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
86,900 Commits 36 Branches 189 Tags
11aedcd71ac38af4d352501eb79ec0aa1fbdfd01
Commit Graph

6070 Commits

Author SHA1 Message Date
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
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
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
264c1d6491 List website into combo sorted by position, ref fields 2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7 Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +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
2d30d33303 NEW Can filter on container type, language and tags in the list of pages 
of website module.
 2020-05-26 12:25:41 +02:00
Laurent Destailleur
40816c02ce Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
Frédéric FRANCE
e5402988d9 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
ef17ed2f87 Look and feel v12 2020-05-24 00:01:52 +02:00
Frédéric FRANCE
174ddc5fd4 prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +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
Frédéric FRANCE
85625a46bb add new rule 2020-05-21 09:35:30 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
atm-quentin
d61cef28d7 NEW conf to allow show full arbo in getnomurl 2020-05-19 11:16:04 +02:00
Laurent Destailleur
b3a17c8da4 Look and feel v12 2020-05-19 04:21:38 +02:00
Laurent Destailleur
88c40633d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
756c1fd73d Fix tooltip message 2020-05-18 15:26:04 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
75ac377352 Fix tar command 2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f exclude other log files 2020-05-16 04:24:23 +02:00
Laurent Destailleur
762ca96203 FIX #13841 2020-05-15 18:28:15 +02:00
Laurent Destailleur
a865dc7232 Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
61f1a57e2f Merge pull request #13850 from andreubisquerra/master 
TakePOS Auto Order improvements
 2020-05-14 16:18:28 +02:00
Laurent Destailleur
2c1e1f43dc Merge pull request #13879 from frederic34/patch-4 
Update dolistore.class.php
 2020-05-14 16:00:36 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:10:04 +02:00
Frédéric FRANCE
366ae2f116 Update dolistore.class.php 2020-05-12 18:44:26 +02:00
Laurent Destailleur
734a8ba312 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
Laurent Destailleur
45caa02929 Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users 
NEW Add option to hide all inactive users into combo list of users.
 2020-05-12 03:18:21 +02:00
Laurent Destailleur
7be47097e9 Merge pull request #13867 from frederic34/patch-4 
Only add empty select if no multiselect
 2020-05-12 03:00:10 +02:00
Frédéric FRANCE
4d50ba5e37 Fix dolistore search with csrf active 2020-05-11 20:42:47 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Frédéric FRANCE
3a46d5a3dd Update agenda_other.php 2020-05-11 18:46:54 +02:00
Laurent Destailleur
a83af075aa Fix responsive 2020-05-11 00:35:05 +02:00
Laurent Destailleur
fe241ea321 Fix removed not reliabled info in PHP info 2020-05-09 21:49:12 +02:00