Commit Graph

84027 Commits

Author SHA1 Message Date
Tobias Sekan
f2fac96a2c
Add helper functions for categories 2020-02-28 16:00:23 +01:00
Tobias Sekan
4f0663e3d8
Merge pull request #2 from Dolibarr/develop
pull from develop
2020-02-27 09:00:55 +01:00
Laurent Destailleur
afc4d6d60c Fix date of cron 2020-02-27 01:22:17 +01:00
Laurent Destailleur
df87c77cd8 css 2020-02-27 01:02:55 +01:00
Laurent Destailleur
f79c1e475d
Merge pull request #13222 from javierybar/develop
New TAKEPOS_ADDON const
2020-02-27 00:13:18 +01:00
Laurent Destailleur
2cfc62d753
Update invoice.php 2020-02-27 00:11:13 +01:00
javierybar
3fa55a59b7
New TAKEPOS_NUMBERING_PREFIX const 2020-02-26 22:45:32 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
8f8a733d7b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-26 17:02:32 +01:00
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
Laurent Destailleur
f797f6bbaf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-26 16:59:04 +01:00
Laurent Destailleur
921dacf695 Fix remove $_POST 2020-02-26 16:58:45 +01:00
Laurent Destailleur
85a4c4cf17 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-26 16:54:08 +01:00
Laurent Destailleur
25157649e2 Fix missing column 2020-02-26 16:53:58 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18
Default warehouse to create order
2020-02-26 16:45:25 +01:00
Laurent Destailleur
39d6c31a5d
Merge pull request #13218 from TobiasSekan/FixWarehouseColumnView
FIX column selection on stocklist
2020-02-26 16:33:11 +01:00
Laurent Destailleur
ab01acfe53
Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 16:30:20 +01:00
Laurent Destailleur
9409a74891
Merge pull request #13209 from oscim/patch-26
Update emailcollector.class.php
2020-02-26 16:22:58 +01:00
Laurent Destailleur
3d436eb645
Merge pull request #13208 from oscim/patch-25
Update emailcollector_card.php
2020-02-26 16:22:28 +01:00
Laurent Destailleur
5ac038419d
Merge pull request #13217 from dolibit-ut/patch-14
http -> https:
2020-02-26 16:20:24 +01:00
Laurent Destailleur
f28278d3d4
Merge pull request #13216 from dolibit-ut/patch-13
licence -> license
2020-02-26 16:20:05 +01:00
Laurent Destailleur
7d242b6a40
Merge pull request #13215 from dolibit-ut/patch-12
http to https
2020-02-26 16:19:46 +01:00
Laurent Destailleur
3164857223
Merge pull request #13213 from dolibit-ut/patch-11
Update
2020-02-26 16:19:15 +01:00
Laurent Destailleur
0befc80d69
Merge pull request #13212 from dolibit-ut/patch-10
update
2020-02-26 16:18:57 +01:00
Laurent Destailleur
9c1c0ee08f Fix for nojs interface 2020-02-26 16:17:31 +01:00
Laurent Destailleur
aba29207a3 Fix param lost 2020-02-26 16:10:12 +01:00
Laurent Destailleur
9f097b1a08 FIX #13146 #13198 2020-02-26 15:45:21 +01:00
Laurent Destailleur
b52cfe58d6 FIX Disable js if no javascript 2020-02-26 15:45:12 +01:00
Laurent Destailleur
4370bf8fdc FIX Use GETPOST instead of POST
Conflicts:
	htdocs/admin/ihm.php
2020-02-26 15:44:54 +01:00
Laurent Destailleur
91e7ff3c8e FIX No js if javascript off 2020-02-26 15:43:09 +01:00
Laurent Destailleur
b5aba25b21 css 2020-02-26 15:41:55 +01:00
Laurent Destailleur
1583bed0e4 FIX #13146 #13198 2020-02-26 15:41:46 +01:00
Laurent Destailleur
0b43d67eea
Merge pull request #13219 from atm-gauthier/10.0_fix_datecontrat_in_list
FIX : timezone must be tzserver and not tzuser as well as on contract card
2020-02-26 15:39:37 +01:00
Laurent Destailleur
4a516a0352
Merge pull request #13220 from ptibogxiv/patch-307
FIX token in barcode tools page
2020-02-26 15:38:12 +01:00
ptibogxiv
b95d74f843
FIX token in barcode tools page 2020-02-26 15:23:59 +01:00
Laurent Destailleur
35e886fb12 FIX Disable js if no javascript 2020-02-26 15:22:23 +01:00
Laurent Destailleur
8ceafa2624 FIX Use GETPOST instead of POST 2020-02-26 15:21:52 +01:00
Laurent Destailleur
315b434a6e FIX No js if javascript off 2020-02-26 15:05:29 +01:00
gauthier
01b9c42670 FIX : timezone must be tzserver and not tzuser as well as on contract card 2020-02-26 15:02:42 +01:00
Tobias Sekan
0622024f61
Fix column selection on stocklist 2020-02-26 14:37:36 +01:00
Tobias Sekan
cb01aaedf5
Merge pull request #1 from Dolibarr/develop
merge from develop
2020-02-26 14:31:03 +01:00
UT from dolibit
4c4050c06e
http -> https:
add: for Linux OS
2020-02-26 12:35:17 +01:00
UT from dolibit
ec3c3f0165
licence -> license 2020-02-26 12:25:25 +01:00
UT from dolibit
5e51369e64
http to https 2020-02-26 12:22:12 +01:00
UT from dolibit
9be050765d
Update
changed Mon organisation to my organisation
2020-02-26 11:42:59 +01:00
UT from dolibit
21f1de2dea
update
changed mon organsiation to my organsiation
2020-02-26 11:39:49 +01:00
Marc de Lima Lucio
d3b70994fe Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice 2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01 FIX: excess paid from situation invoices not counted when calculating remain to pay 2020-02-26 10:35:43 +01:00
stickler-ci
ada99b01f9 Fixing style errors. 2020-02-26 07:20:28 +00:00
stickler-ci
0e91b9e5ec Fixing style errors. 2020-02-26 07:20:08 +00:00