Commit Graph

84603 Commits

Author SHA1 Message Date
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
b41ac2a428 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-18 18:37:55 +01:00
Laurent Destailleur
a3328c5ef3 Fix div 2020-03-18 18:37:44 +01:00
Laurent Destailleur
e9e0ce591b
Merge pull request #13379 from atm-lena/11.0_FIX_extrafields_add_tpl_include
FIX : wrong include - replace extrafields_create.tpl.php to extrafiel…
2020-03-18 18:26:57 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
Laurent Destailleur
a848a8523a
Merge pull request #13377 from atm-john/11.0_fix_situations_invoices_stuff
Fix situations invoices stuff
2020-03-18 18:20:27 +01:00
Laurent Destailleur
cc93a40c45 Fix label of local tax 2020-03-18 14:06:15 +01:00
Laurent Destailleur
56e4fa1bb3 Trans 2020-03-18 14:01:11 +01:00
ATM john
4f1dd5439f Merge branch '11.0_fix_situations_invoices_stuff' of github.com:atm-john/dolibarr into 11.0_fix_situations_invoices_stuff 2020-03-18 10:35:49 +01:00
ATM john
7b8cafb710 remove var_dump 2020-03-18 10:34:44 +01:00
stickler-ci
0a5f971eb5 Fixing style errors. 2020-03-18 09:32:34 +00:00
ATM john
d3aeec0a7c Fix situation value transmission 2020-03-18 10:30:15 +01:00
atm-lena
2e1554def4 FIX : wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php 2020-03-18 10:18:52 +01:00
Ferran Marcet
1fe4e4415e FIX: Bank movements color is not showing 2020-03-18 09:27:08 +01:00
Laurent Destailleur
a76392f944 Responsive 2020-03-17 21:26:25 +01:00
ATM john
075757eb3d Fix situation value transmission 2020-03-17 16:49:05 +01:00
Laurent Destailleur
9525289488 Fix return code of some API 2020-03-17 13:50:20 +01:00
Laurent Destailleur
76fc722638 NEW Can get some variables (not available by default) 2020-03-17 13:33:21 +01:00
ATM john
cb43928a5d Fix radio label target 2020-03-17 12:29:14 +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
ee29125579 typo 2020-03-15 11:29:00 +01:00
Laurent Destailleur
8927d40cc4 Prepare 11.0.3 2020-03-15 11:28:00 +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
37fce0d3ee Fix position on merou
Fix preselected value on contact
2020-03-14 14:45:37 +01:00