lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
85,371 Commits 43 Branches 150 Tags 886 MiB
422e33a68b
Commit Graph

85371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
8e246f2a18 Prepare 11.0.4 2020-04-12 16:54:54 +02:00
Laurent Destailleur
acbbffdb7f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 16:54:15 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:54:09 +02:00
Laurent Destailleur
94ae75c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-12 16:53:07 +02:00
Laurent Destailleur
eebf48b27c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:52:58 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Laurent Destailleur
b1bae5f3dd
Merge pull request #13569 from tuxgasy/Fix_breaking_selectForFormsList 
Keep compatibility with old object declaration
 2020-04-12 16:48:08 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php 2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php 2020-04-12 16:46:21 +02:00
Laurent Destailleur
e9ee7a23e6
Merge pull request #13573 from frederic34/patch-11 
Update actioncomm.class.php
 2020-04-12 16:42:07 +02:00
Laurent Destailleur
3cc68c6972
Merge pull request #13579 from atm-maxime/fix_variants_links 
Fix #13576 : links on variants
 2020-04-12 16:38:56 +02:00
Laurent Destailleur
a38e273ae8
Merge pull request #13583 from atm-maxime/fix_default_workdayhour 
Fix #13468 setup working days and hours
 2020-04-12 16:38:36 +02:00
Laurent Destailleur
ba2c035556
Merge pull request #13580 from atm-maxime/fix_composition_token 
Fix missing token on product composition
 2020-04-12 16:36:48 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Maxime Kohlhaas
20e684ec69 Fix #13468 setup working days and hours 2020-04-12 15:30:58 +02:00
Laurent Destailleur
0916017519 Fix addreplace hook 2020-04-12 15:29:13 +02:00
Laurent Destailleur
d7784887d1 More font awesome picto 2020-04-12 14:58:50 +02:00
Laurent Destailleur
6b16a3ad39 NEW Can check all events in one click in setup of audited events 2020-04-12 13:25:19 +02:00
Maxime Kohlhaas
8bca68cfba Fix missing token on product composition 2020-04-12 10:39:16 +02:00
Maxime Kohlhaas
3f59ca6418 Fix #13576 : links on variants 2020-04-12 10:13:37 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php 2020-04-11 22:38:28 +02:00
TuxGasy
fecfe2e3a1 Keep compatibility with old object declaration 2020-04-11 18:37:06 +02:00
Laurent Destailleur
6eab2ec295 Fix Replacement 2020-04-11 18:29:42 +02:00
Laurent Destailleur
ca8e1f3ea5 NEW Can replace a string into all pages in website module 2020-04-11 18:18:53 +02:00
Laurent Destailleur
33a5288125 Add log 2020-04-11 16:34:59 +02:00
Laurent Destailleur
800a72a2b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-11 14:18:19 +02:00
Laurent Destailleur
4c515f726f Can sort list of answers. 2020-04-11 14:18:09 +02:00
Laurent Destailleur
760121a3d1 Can sort list of answers. 2020-04-11 14:13:16 +02:00
Laurent Destailleur
1ed24d3949 Fix trans 2020-04-11 12:42:08 +02:00
Laurent Destailleur
d8e0036817 css 2020-04-11 12:41:53 +02:00
Laurent Destailleur
6a955da4e9
Merge pull request #13546 from oscim/patch-33 
Update llx_societe.key.sql
 2020-04-11 01:31:29 +02:00
Laurent Destailleur
47f00f8bc8
Update llx_societe.key.sql 
Keep only fields that are enough discriminent for new indexes
 2020-04-11 01:31:03 +02:00
Laurent Destailleur
eb63350d55 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-11 01:09:36 +02:00
Laurent Destailleur
450b1761b1 Fix label 2020-04-11 01:09:26 +02:00
Laurent Destailleur
9ab2adab7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-11 00:56:29 +02:00
Laurent Destailleur
db30f0bbc4 NEW Receipt printer module moved from 'development' to 'experimental' 2020-04-11 00:56:18 +02:00
Laurent Destailleur
b3beb42857
Merge pull request #13561 from andreubisquerra/master 
Up to 2 orders printers in TakePOS with Receipt printers module
 2020-04-10 20:06:35 +02:00
Laurent Destailleur
679b94dcaa
Merge pull request #13553 from atm-quentin/11_fix_checkbox_supplier_order 
FIX missing selectedlines on supplier order
 2020-04-10 20:04:24 +02:00
Laurent Destailleur
70e71d32c7
Merge pull request #13555 from atm-gauthier/fix_cabyprodserv 
FIX : some others modules (like subtotal) use other product_type than…
 2020-04-10 20:03:56 +02:00
Laurent Destailleur
b693525b3e
Merge pull request #13557 from philazerty/patch-9 
FIX #13519 - Update list.php
 2020-04-10 20:03:27 +02:00
Laurent Destailleur
eb3ed7ffdf Complete index on tickets 2020-04-10 20:02:57 +02:00
Laurent Destailleur
2cebffbc94
Merge pull request #13558 from philazerty/patch-10 
Index optimization for ticket
 2020-04-10 20:00:07 +02:00
Laurent Destailleur
6960f79e40
Update llx_ticket.key.sql 2020-04-10 19:59:45 +02:00
andreubisquerra
bcbd7632bf
Fix travis 2020-04-10 19:49:59 +02:00
jove@bisquerra.com
66659f0693 Two diferents order printers 2020-04-10 19:18:42 +02:00
philazerty
0aab98abff
Index optimization for ticket 
When there are a lot of tickets, the search can be long without these indexes.
 2020-04-10 17:05:53 +02:00
philazerty
63d41fa356
Update list.php 
Bug #13519
 2020-04-10 16:48:18 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
Laurent Destailleur
267677a925 Fix phpcs 2020-04-10 14:02:35 +02:00