Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

540 Commits

Author SHA1 Message Date
Laurent Destailleur
dc18e3efb5 Merge pull request #12278 from andreubisquerra/master 
Default customer relative discount in TakePOS
 2019-11-02 13:03:43 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11 
Enhance the progress bar of tasks
 2019-11-01 15:53:57 +01:00
Laurent Destailleur
1821fa6317 Fix translation of "Terminal" 2019-11-01 12:48:09 +01:00
andreubisquerra
dbb5729f04 Default customer relative discount in TakePOS 2019-10-30 22:34:54 +01:00
Laurent Destailleur
26a58682b0 Merge pull request #12217 from andreubisquerra/develop 
REF to customer readable place in TakePOS BAR
 2019-10-30 03:01:49 +01:00
Frédéric FRANCE
16f58f1eee clean indent 2019-10-27 10:38:52 +01:00
andreubisquerra
709f2c08b0 travis errors 2019-10-24 21:39:47 +02:00
andreubisquerra
5904b0bea4 Travis errors 2019-10-24 20:00:17 +02:00
andreubisquerra
6c8c41aaba REF to customer readable place in TakePOS BAR 
Convert the invoice reference to a readable format for customers and waiters in non validated printed vouchers.

(PROV-POS1-5)
to:
Terminal 1 Place 5
 2019-10-24 19:14:12 +02:00
stickler-ci
0e7f3c307e Fixing style errors. 2019-10-23 20:05:37 +00:00
ptibogxiv
6ff13ab7e1 Update invoice.php 2019-10-23 22:03:43 +02:00
Laurent Destailleur
a4eab82894 Merge pull request #12191 from andreubisquerra/master 
NEW Multiple payments in a TakePOS sale
 2019-10-22 12:45:19 +02:00
Laurent Destailleur
6638b361d4 Update invoice.php 2019-10-22 12:44:19 +02:00
Laurent Destailleur
be3f0471ff Fix phpcs 2019-10-21 11:27:48 +02:00
andreubisquerra
df181d1f35 Multiple payments in a TakePOS sale 2019-10-20 22:01:54 +02:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
05352a62e5 css 2019-10-20 15:37:20 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
45d64e468f Fix regression 2019-10-20 15:29:15 +02:00
Laurent Destailleur
e224170dc2 FIX Clean the + of categories on the product view only in POS module 
Conflicts:
	htdocs/takepos/takepos.php
 2019-10-20 15:27:09 +02:00
Laurent Destailleur
f999430fd3 FIX Clean the + of categories on the product view only in POS module 2019-10-20 15:24:52 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
955e25d7c6 Merge pull request #12150 from andreubisquerra/master 
Redesign of the TakePOS mobile layout and more functions
 2019-10-17 17:56:12 +02:00
Laurent Destailleur
e709c005a0 FIX Payment was not saved on TakePOS module. 2019-10-17 12:28:48 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
7960c91955 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/theme/md/style.css.php
 2019-10-16 17:27:41 +02:00
andreubisquerra
8f03813aa9 Phone layout and functional improvements 2019-10-16 16:26:00 +02:00
Laurent Destailleur
568faef7f4 Fix encoding of message 2019-10-15 04:08:34 +02:00
Laurent Destailleur
060452ecf2 Fix link 2019-10-10 15:29:27 +02:00
Laurent Destailleur
ec1acf710c Fix missing br 2019-10-09 18:15:59 +02:00
Laurent Destailleur
1ca5a33e53 Merge branch 'develop' into patch-243 2019-10-08 15:04:03 +02:00
Laurent Destailleur
b3e2163903 Merge pull request #12014 from andreubisquerra/develop 
Price with tax when manual modify price in TakePOS
 2019-10-03 17:49:05 +02:00
Laurent Destailleur
09f7a68d6d Show ref of product on mouse hover thumbs 2019-10-03 17:40:59 +02:00
Laurent Destailleur
331148499a Fix check on terminal setup 2019-10-03 17:11:41 +02:00
andreubisquerra
64ca8acc54 Price with tax when manual modify price in TakePOS 2019-10-01 20:36:24 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
andreubisquerra
741447d990 Fix Travis errors 2019-09-29 21:30:06 +02:00
andreubisquerra
34be514326 Custom receipt tab in TakePOS 2019-09-29 20:56:24 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
435edf999b Fix: label of product not always visible after a search 2019-09-27 11:05:44 +02:00
Laurent Destailleur
8c3c7fd857 Fix remove + of categ on product thumb 2019-09-27 10:21:14 +02:00
Laurent Destailleur
64a7bbe0fd Move ajax file 2019-09-27 10:19:27 +02:00
Laurent Destailleur
5d0d3b3908 Description on 2 lines max 2019-09-27 09:57:48 +02:00
Laurent Destailleur
2e1decc57e Use css instead of hard coded style 2019-09-26 17:41:37 +02:00
Juanjo Menent
b838ab0c31 Fix search by ref 2019-09-25 12:13:27 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Juanjo Menent
c97bd14278 FIX TakePOS no invoice validation control and good payment translate 2019-09-24 10:08:48 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00