Commit Graph

84584 Commits

Author SHA1 Message Date
Anthony Berton
fa2ccf6c44
Merge branch 'develop' into patch-17 2020-03-17 11:22:07 +01:00
Laurent Destailleur
4f442905b2 A new way to navigate between pages in list is available 2020-03-17 03:31:58 +01:00
Laurent Destailleur
5f255a6c14 A new way to navigate between pages in list is available 2020-03-17 03:24:24 +01:00
Laurent Destailleur
42271bb768 CSS 2020-03-17 02:30:19 +01:00
Laurent Destailleur
94750ed350 css 2020-03-17 01:31:48 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
01724894ad Fix useless BR 2020-03-16 18:33:06 +01:00
Laurent Destailleur
ffc861d4e2 FIX Autoadd product when barcode match
Show barcode value in tooltips
2020-03-16 18:04:22 +01:00
Laurent Destailleur
1212a63365 css 2020-03-16 15:53:00 +01:00
Laurent Destailleur
c66f9476a8 Show owner of card in list 2020-03-16 15:49:58 +01:00
Laurent Destailleur
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
Laurent Destailleur
41ae8f6f68 TakePOS: Move all information of customer in the header 2020-03-16 13:27:10 +01:00
Laurent Destailleur
621c4ff4e7 Fix phpcs 2020-03-15 19:52:46 +01:00
Laurent Destailleur
01e4a74167 Merge branch 'andreubisquerra-develop' into develop 2020-03-15 13:58:08 +01:00
Laurent Destailleur
22e8fdb46b Enhance #13033 2020-03-15 13:57:31 +01:00
stickler-ci
1a97e7283f Fixing style errors. 2020-03-15 12:09:52 +01:00
andreubisquerra
d7150fb592 Change cash control procedure 2020-03-15 12:09:52 +01:00
Laurent Destailleur
0764842ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-15 12:08:27 +01:00
Laurent Destailleur
27cc7ebe33 Fix regression 2020-03-15 12:08:09 +01:00
Laurent Destailleur
5185cc2821
Merge pull request #13345 from aspangaro/12.0_a21
Work on reconciliation of accouting account
2020-03-15 11:14:47 +01:00
Laurent Destailleur
2cc68fec26
Update accountancy.lang 2020-03-15 11:13:46 +01:00
Laurent Destailleur
891bc52532
Update accountingaccount.class.php 2020-03-15 11:12:10 +01:00
Laurent Destailleur
1a273551be
Update accountingaccount.class.php 2020-03-15 11:11:12 +01:00
stickler-ci
375bcf8720 Fixing style errors. 2020-03-15 07:01:36 +00:00
Alexandre SPANGARO
789529c0e0 Work on reconciliation of accouting account 2020-03-15 07:55:35 +01:00
Alexandre SPANGARO
bc717bc6ae Work on reconciliation of accouting account 2020-03-15 07:49:24 +01:00
Laurent Destailleur
92f4250a02 Fxi trans 2020-03-14 22:22:55 +01:00
Laurent Destailleur
54d9f6a703 Deprecated comment 2020-03-14 16:35:16 +01:00
Laurent Destailleur
aef827f826 Alias on same line than name 2020-03-14 14:47:01 +01:00
Laurent Destailleur
f92943bee2 css 2020-03-14 03:24:46 +01:00
Laurent Destailleur
0d2d2302d5 Removed not relevant graph on stats on project 2020-03-14 03:18:49 +01:00
Laurent Destailleur
6e71bb8707 Look and feel v12: Use color of status for dotnuts 2020-03-14 02:17:08 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
8a9553522f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-14 00:14:52 +01:00
Laurent Destailleur
f774733fcb Sync transifex 2020-03-14 00:14:42 +01:00
Laurent Destailleur
30bcf1d244 Uniformize code 2020-03-13 18:51:58 +01:00
Laurent Destailleur
880cfd1659 FIX #13332 Add more details on screen and help so it is easier to
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
2020-03-13 18:10:00 +01:00
Laurent Destailleur
36873f2db7 Fix bad include 2020-03-13 17:22:54 +01:00
Laurent Destailleur
41a2304470
Merge pull request #13332 from aspangaro/12.0_a21
FIX: Accounting management of intra-community sales to a non-taxable thirdparty
2020-03-13 17:01:13 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
6948e347c4
Merge pull request #13329 from atm-florian/fix_11_multiEntityOnCommCardElement
Fix 11 multi entity on comm card element
2020-03-13 16:57:10 +01:00
Laurent Destailleur
618d276349
Merge pull request #13335 from FHenry/dev_ldcompta10
NEW : accounting export LD compta version 10
2020-03-13 16:55:42 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6 Fix look and feel v11 2020-03-13 16:52:00 +01:00
Laurent Destailleur
99669583d5 Fix phpcs 2020-03-13 16:46:07 +01:00
florian HENRY
ca269864f7 let keep it to expedition 2020-03-13 14:55:34 +01:00
Laurent Destailleur
d90bf25351 Fix phpcs 2020-03-13 13:11:04 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a NEW Another way to navigate between pages for some lists 2020-03-13 12:53:22 +01:00
Laurent Destailleur
893ae21d3a Fix phpcs 2020-03-13 11:29:27 +01:00