Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

297 Commits

Author SHA1 Message Date
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Nicolas
0c424db506 Correct stickler 2021-02-24 16:03:24 +01:00
Nicolas
589c757fbf Correct stickler 2021-02-24 15:57:33 +01:00
Nicolas
49c0967a3e NEW option for Takepos to show the total price without tax 2021-02-24 15:48:15 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Frédéric FRANCE
f394e55ade deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
 2021-01-02 15:49:30 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
 2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79 FIX Dates of sales start in TakePOS 2020-12-30 21:43:04 +01:00
Laurent Destailleur
255b943b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-12-30 21:25:02 +01:00
Laurent Destailleur
1ec763fc14 FIX When creating a new POS sell, the creation date must be modified. 2020-12-30 21:22:54 +01:00
Laurent Destailleur
cad93fd585 Fix stock popup when line is not a predefined product on TakePOS 2020-12-07 22:26:08 +01:00
ptibogxiv
b3fe38d6bb Fix list current ticket in takepos with multicompany 2020-12-06 14:20:16 +01:00
Laurent Destailleur
6b0092c30a Several minor bugfixes. Hide option TAKEPOS_NUMPAD_USE_PAYMENT_ICON. 2020-12-04 00:58:51 +01:00
Laurent Destailleur
c215764627 Fix phpcs 2020-12-01 15:45:19 +01:00
Laurent Destailleur
3538e485a8 Fix phpunit 2020-12-01 11:38:46 +01:00
Laurent Destailleur
e689df8359 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/takepos/invoice.php
	htdocs/user/list.php
 2020-12-01 10:04:51 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
7870a33fd3 Update invoice.php 2020-11-30 15:39:35 +01:00
stickler-ci
9ee37153f7 Fixing style errors. 2020-11-30 10:32:58 +00:00
teleassist
560194c3b9 FIX #15374 : "New" doesn't clear total amounts 
Invoice's total amounts where not updated because of direct lines deleting in database.
 2020-11-30 11:22:49 +01:00
andreubisquerra
f6eadbbc3f Order receipt improvements in TakePOS 2020-11-24 21:48:08 +01:00
lvessiller
8de5925f8b FIX remove LOG_ERR in syslog 2020-11-18 14:32:11 +01:00
lvessiller
3048a16b42 NEW log sale without lines as error in cash desk 2020-11-17 10:11:58 +01:00
andreubisquerra
5e7f1a545e Fix travis 2020-11-12 22:50:46 +01:00
jove@bisquerra.com
a5ffac1935 Compatibility with new TakePOS connector 2020-11-12 22:31:32 +01:00
jove@bisquerra.com
43ced3c681 Credit note improvement in TakePOS 2020-11-10 21:45:15 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
javierybar
d23b6e145a Fixes 2020-10-25 20:24:17 +01:00
javierybar
81ed97c9ba NEW Credit invoice in TakePOS 2020-10-25 20:03:25 +01:00
ptibogxiv
7e8891bef9 NEW display date range if exist in takepos 
usefull for membership via POS (ie use in adherentsplus before pushing in core)
 2020-10-18 12:40:10 +02:00
Laurent Destailleur
69432284d0 Merge pull request #14999 from andreubisquerra/master 
NEW: Add third order printer to TakePOS
 2020-10-13 11:03:41 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
andreubisquerra
d80931429e Fix travis 2020-10-12 22:34:05 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
1b92e03f47 Merge pull request #14921 from ptibogxiv/patch-383 
NEW set entity when creating invoice on takepos
 2020-10-08 19:30:37 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
bb39d7b205 Merge pull request #14916 from ptibogxiv/patch-382 
Fix  and save change of currency in invoice (takepos)
 2020-10-05 16:44:28 +02:00
Laurent Destailleur
44ecc15a07 Merge pull request #14915 from ptibogxiv/patch-380 
Fix reload display when invoice deleting in takepos
 2020-10-05 16:43:55 +02:00
Laurent Destailleur
0fdad1b63d Merge pull request #14914 from ptibogxiv/patch-379 
Fix better display print/send button on takepos
 2020-10-05 16:43:11 +02:00
Laurent Destailleur
10d21eee03 Merge pull request #14911 from ptibogxiv/patch-376 
Fix display stock rights in takepos
 2020-10-05 16:42:31 +02:00
Laurent Destailleur
099c19cefb Merge pull request #14912 from ptibogxiv/patch-378 
NEW multicurrency total in takepos
 2020-10-05 16:40:59 +02:00
Laurent Destailleur
243d576f83 Update invoice.php 
Log for debug
 2020-10-05 16:38:40 +02:00
andreubisquerra
1c34a7acda NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:50:27 +02:00
ptibogxiv
1a407e4c22 NEW set entity when creating invoice on takepos 
usefull for marketplace, coworking, multibranding shop
 2020-10-04 22:09:40 +02:00
ptibogxiv
55764779c4 Update invoice.php 2020-10-04 17:12:01 +02:00