Laurent Destailleur
|
41ae8f6f68
|
TakePOS: Move all information of customer in the header
|
2020-03-16 13:27:10 +01:00 |
|
UT from dolibit
|
8e712c6d0e
|
Update https for country websites
Update https for country websites
|
2020-03-16 13:13:11 +01:00 |
|
UT from dolibit
|
a6a1ba0db2
|
Update README.md
|
2020-03-16 12:47:00 +01:00 |
|
Alexandre SPANGARO
|
6b168428d8
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a22
|
2020-03-16 12:11:01 +01:00 |
|
VESSILLER
|
5a4bd28417
|
NEW labels on reduction buttons in cash desk
|
2020-03-16 11:56:47 +01:00 |
|
florian HENRY
|
ef83801a53
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep
|
2020-03-16 11:53:49 +01:00 |
|
florian HENRY
|
117ff5f4eb
|
add hook to add sql filter in where clause on select users
|
2020-03-16 11:49:03 +01:00 |
|
VESSILLER
|
350408d2ac
|
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product
|
2020-03-16 11:10:41 +01:00 |
|
Alexandre SPANGARO
|
301b97f6d2
|
FIX Update fiscalyear.class.php to filter on entity
|
2020-03-16 10:05:22 +01:00 |
|
stickler-ci
|
fd4e807211
|
Fixing style errors.
|
2020-03-16 07:40:10 +00:00 |
|
Tobias Sekan
|
debecabe69
|
FIX missing "contact_" substitution in supplier proposal
|
2020-03-16 08:38:01 +01:00 |
|
Alexandre SPANGARO
|
191374cc8f
|
Work on reconcilation of accouting account
|
2020-03-16 08:07:05 +01:00 |
|
Tobias Sekan
|
c50f2b32d8
|
Add substitution for "user_civility" for ODT
|
2020-03-16 07:58:44 +01:00 |
|
Tobias Sekan
|
c2b1178273
|
Add substitution for user_civility for ODT
|
2020-03-16 07:55:15 +01:00 |
|
Tobias Sekan
|
904bf71588
|
Merge pull request #9 from Dolibarr/develop
pull from develop
|
2020-03-16 07:51:59 +01:00 |
|
Alexandre SPANGARO
|
af5444806d
|
Work on reconcilation of accouting account
|
2020-03-16 06:41:14 +01:00 |
|
stickler-ci
|
1f83e5ac54
|
Fixing style errors.
|
2020-03-15 21:30:46 +00:00 |
|
bahfir abbes
|
0ad68c180d
|
fix:Show units of products in stocks and hide total units if content is of diffents units
|
2020-03-15 22:26:23 +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 |
|
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
|
8192e9dc67
|
FIX Missing token in form
|
2020-03-14 03:02: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 |
|
VESSILLER
|
1268bab958
|
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product
|
2020-03-13 17:27:04 +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 |
|