Commit Graph

93736 Commits

Author SHA1 Message Date
Laurent Destailleur
39b6f2fb6a Revert. restore old behaviour, the picto before the input field lead to
confusion for some users and break presentation with some pages
2021-01-15 13:36:24 +01:00
Laurent Destailleur
e5126885fb Fix css 2021-01-15 13:27:45 +01:00
Laurent Destailleur
d7a776ad8a Fix url 2021-01-15 13:23:59 +01:00
Laurent Destailleur
dc9cd28437 Look and feel v14 2021-01-15 13:14:21 +01:00
Laurent Destailleur
a16fa64596 Fix merge 2021-01-15 11:42:54 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
6db640d0d0 Fix phpcs 2021-01-15 11:41:09 +01:00
Laurent Destailleur
c6c7cbf208 Fix trans 2021-01-15 11:21:47 +01:00
Laurent Destailleur
bcfe03216a FIX error managent and db transaction balance 2021-01-14 19:15:54 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
ee7aacae54 More complete error message 2021-01-14 15:19:56 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
2021-01-14 13:43:48 +01:00
Laurent Destailleur
446e3b9a9d css 2021-01-14 13:26:54 +01:00
Laurent Destailleur
ea47a55144 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-14 12:59:27 +01:00
Laurent Destailleur
1cf86931b3 Fix graph of opportunity when a status has been removed. 2021-01-14 12:58:50 +01:00
Laurent Destailleur
ea60a824ee Comment 2021-01-14 11:07:48 +01:00
Laurent Destailleur
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Laurent Destailleur
77a094007f Fix parm to url to switch between screen
Fix error message
Make position of columns more friendly
2021-01-14 10:34:32 +01:00
Laurent Destailleur
43161be711 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 17:45:38 +01:00
Laurent Destailleur
0af5c9ae91 Fix phpcs 2021-01-13 17:45:17 +01:00
Laurent Destailleur
ce15b31a53
Merge pull request #15972 from dolibit-ut/patch-63
Update ChangeLog
2021-01-13 14:23:42 +01:00
Laurent Destailleur
df9f2cdca4
Merge pull request #15164 from marc-dll/NEW_product_customer_price_ref
NEW: customer ref for product customer prices
2021-01-13 14:22:55 +01:00
UT from dolibit
933367a4a2
Update ChangeLog
- changed  "Nature of product is now a dictionay" to   "Products - Nature of product is now a dictionary   #13287"
- sortings
2021-01-13 13:56:01 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Laurent Destailleur
5f396a372d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-13 12:37:02 +01:00
Laurent Destailleur
2ea5b331b4 README 2021-01-13 12:36:33 +01:00
Laurent Destailleur
93a2edd8d9 Fix property not used 2021-01-13 12:21:26 +01:00
Laurent Destailleur
3bed2c91c7 Fix version 2021-01-13 12:20:32 +01:00
Laurent Destailleur
1571b0496c
Merge pull request #15794 from atm-gauthier/develop_new_workstation
NEW : Workstations management
2021-01-13 12:19:38 +01:00
Laurent Destailleur
114b52ef00
Merge pull request #15969 from aspangaro/13a26
FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice ref
2021-01-13 12:18:14 +01:00
Laurent Destailleur
30caa78f33
Merge pull request #15968 from frederic34/patch-8
code syntax
2021-01-13 12:01:10 +01:00
Laurent Destailleur
8d65dff93d Fix missing param 2021-01-13 11:16:48 +01:00
Laurent Destailleur
db8ca42da2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-13 11:15:51 +01:00
Laurent Destailleur
ffc936fff3 Fix missing param 2021-01-13 11:15:30 +01:00
Alexandre SPANGARO
dae1794e3d FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice 2021-01-13 11:08:33 +01:00
Frédéric FRANCE
dad329602a
Update html.formmail.class.php 2021-01-12 23:46:29 +01:00
Frédéric FRANCE
cf24fd5d85
code syntax 2021-01-12 23:30:59 +01:00
Laurent Destailleur
eb2faed656 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-12 21:06:20 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Laurent Destailleur
a7c78c2f60
Merge pull request #15960 from seblu/fix_ldap_login
Use login from LDAP attribute
2021-01-12 20:59:46 +01:00
Laurent Destailleur
a72b33367a
Merge pull request #15957 from aspangaro/13b8
FIX: Accountancy - Piece is a required field for FEC compatibility
2021-01-12 20:57:20 +01:00
Laurent Destailleur
942016d0cd
Merge pull request #15956 from aspangaro/13b7
FIX : Accountancy - FEC Export - Add trans & unaccent on journal label
2021-01-12 20:56:11 +01:00
Laurent Destailleur
2b9ce6995f
Merge pull request #15951 from FHenry/12_fix_update_groupname
fix: update group name
2021-01-12 20:26:17 +01:00
Laurent Destailleur
3054fb4cd6
Merge pull request #15959 from FHenry/dev_fix_contact_bulk
Dev fix contact bulk
2021-01-12 20:25:26 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Marc de Lima Lucio
759dd379d3 NEW: customer price customer ref: push back to v14 2021-01-12 14:43:09 +01:00
Laurent Destailleur
2e9f3b803d Add some hooks to add new buttons (compensation of removal of tabs).
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
2021-01-12 13:59:20 +01:00