Commit Graph

84745 Commits

Author SHA1 Message Date
Laurent Destailleur
b3e87e89b7 Add more excluding tags 2020-03-22 20:35:47 +01:00
Laurent Destailleur
f20e0efe06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:22:41 +01:00
Laurent Destailleur
c80c247a84 Fix phpcs 2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8 Fix phpcs 2020-03-22 20:22:08 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master
NEW: Multiple sales in TakePOS
2020-03-22 20:19:40 +01:00
Laurent Destailleur
1cb598290a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:17:10 +01:00
Laurent Destailleur
cd0b0111e1
Merge pull request #13395 from glu000/develop
Fix #13394
2020-03-22 20:16:59 +01:00
Laurent Destailleur
1fdef022f0 css 2020-03-22 20:16:14 +01:00
Laurent Destailleur
cafe898b6a
Merge pull request #13392 from andreubisquerra/develop
Remove vars to avoid conficts in TakePOS setup
2020-03-22 19:49:38 +01:00
Laurent Destailleur
226f4695cd Fix migration of type of field 2020-03-22 19:48:53 +01:00
Laurent Destailleur
8313ed9ee4
Merge pull request #13388 from OPEN-DSI/new-type-category-from-hook
NEW add category type from hook
2020-03-22 19:45:31 +01:00
Laurent Destailleur
6f3cbe69e8 Fix phpcs 2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639 WIP Edit fields into alternate language 2020-03-22 19:11:21 +01:00
Laurent Destailleur
b0f3fba71a Fix phpcs 2020-03-22 18:27:56 +01:00
Laurent Destailleur
5df690f9bb Fix phpcs 2020-03-22 17:29:15 +01:00
Laurent Destailleur
3d6849dfea Fix label of tabs 2020-03-22 17:27:08 +01:00
Laurent Destailleur
ce47351b76 Trans 2020-03-22 17:11:58 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
andreubisquerra
40e5e7a46b
Travis fixes 2020-03-22 15:24:32 +01:00
jove@bisquerra.com
a2b973f9f7 NEW: Multiple sales in TakePOS 2020-03-22 14:50:09 +01:00
Laurent Destailleur
425d2afc4b Rename js into js.php. Fix some labels 2020-03-22 12:31:27 +01:00
Laurent Destailleur
23e06debb7 Popup is smaller 2020-03-22 11:52:02 +01:00
Laurent Destailleur
9f583226f9 FIX var $ismutientitymanaged must be public not protected 2020-03-22 11:45:40 +01:00
Laurent Destailleur
a0dfbaaea8 Fix: Clean header an non https redirect to avoid to have cookie session
ID in non https answers.
2020-03-22 02:16:33 +01:00
Laurent Destailleur
ba8ece525d NEW If $dolibarr_main_force_https is set, the flag 'secure' on session
cookie is also set.
2020-03-22 01:59:32 +01:00
Laurent Destailleur
c8b05036a4 Prepare notif using the notif table 2020-03-22 01:24:50 +01:00
Laurent Destailleur
e2acb0c65e code indent 2020-03-21 19:37:09 +01:00
Laurent Destailleur
198914f91d Rename file 2020-03-21 19:20:33 +01:00
Laurent Destailleur
792b9228d3 Can search in several different type of containers 2020-03-21 19:09:14 +01:00
glu000
0746d70071 Merge remote-tracking branch 'upstream/develop' into develop 2020-03-21 18:17:18 +01:00
Laurent Destailleur
83b8497d28 Rename sample file so we can use color editor 2020-03-21 17:58:03 +01:00
glu000
16c4e3a5b0 Fix #13394 2020-03-21 17:55:10 +01:00
Laurent Destailleur
79086011f8 Work on RSS export of blog posts 2020-03-21 17:31:44 +01:00
Laurent Destailleur
666b38b44a Fix charset in RSS export 2020-03-21 17:31:09 +01:00
andreubisquerra
4b7de1e5f5
Remove vars to avoid conficts in TakePOS setup 2020-03-21 15:48:25 +01:00
Laurent Destailleur
7370268b13 Tool to regenerate files 2020-03-21 11:04:33 +01:00
Laurent Destailleur
39af3635c5 Responsive 2020-03-20 21:50:34 +01:00
Laurent Destailleur
640ee5277c FIX Look and feel v11 2020-03-20 21:19:43 +01:00
Laurent Destailleur
588692760a FIX Look and feel v11 2020-03-20 21:16:52 +01:00
Laurent Destailleur
68cadb58bb Fix better default sort order 2020-03-20 20:36:26 +01:00
Laurent Destailleur
27015fc6f6 NEW Add method to add social network sharing buttons on blog posts 2020-03-20 19:34:49 +01:00
Laurent Destailleur
a2f9f72973 Enhance website module 2020-03-20 18:58:45 +01:00
Laurent Destailleur
f904ff5240 Add dol_escape_json method 2020-03-20 17:10:35 +01:00
Laurent Destailleur
aa1f601528 FIX Backto link 2020-03-20 16:30:45 +01:00
Laurent Destailleur
43763771a6 FIX Backto link 2020-03-20 15:47:50 +01:00
VESSILLER
ac5d2fedc5 NEW add category type from hook 2020-03-20 15:40:46 +01:00
Laurent Destailleur
4e007fe94c Import jommla news 2020-03-20 15:12:50 +01:00
Laurent Destailleur
e61222504a Look and feel 2020-03-20 11:49:00 +01:00
Laurent Destailleur
e0fd80af1f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-20 10:51:47 +01:00
Laurent Destailleur
5f0f376817
Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product
NEW add a parameter to group same product
2020-03-20 10:45:06 +01:00