Anthony Berton
b143fb6b9e
Update list.php
2021-01-13 18:52:27 +01:00
Frédéric FRANCE
923a5fe2a5
Merge remote-tracking branch 'upstream/develop' into davadmin
2021-01-13 18:45:29 +01:00
Frédéric FRANCE
271378fb87
add translation
2021-01-13 18:09:57 +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
Anthony Berton
45d91d8251
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into HEAD
2021-01-13 17:43:54 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2
2021-01-13 17:40:21 +01:00
Frédéric FRANCE
a5678147dd
add missing translation
2021-01-13 16:52:32 +01:00
Frédéric FRANCE
40a45efb63
fix code
2021-01-13 16:23:54 +01:00
Frédéric FRANCE
cb7266d261
fix trans
2021-01-13 16:18:23 +01:00
Frédéric FRANCE
11100b3017
missing default value
2021-01-13 15:16:43 +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
stickler-ci
432d45b289
Fixing style errors.
2021-01-13 11:19:39 +00: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
1499998a99
Debug
2021-01-13 12:17:45 +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
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-12 23:47:24 +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
Florian HENRY
7e30812529
fix review
2021-01-12 22:01:53 +01:00
zuiko
f718a396d5
Update mod_barcode_product_standard.php
...
$out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database
Take the libelle instead the code for the litteral value of the barcode type rowid.
2021-01-12 21:59:09 +01:00
Florian HENRY
3ddcc0efd3
revert stuff from 12.0
2021-01-12 21:50:02 +01:00
Florian HENRY
1cc88794b5
merge from 12.0 because this bug comme from it
2021-01-12 21:48:34 +01:00
Florian HENRY
78e3dd3fa8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2021-01-12 21:44:48 +01:00
Florian HENRY
34b792e9a2
betterfix
2021-01-12 21:44:18 +01:00
zuiko
364158c35b
Update mod_barcode_product_standard.php
...
Blank line after comment removed...
2021-01-12 21:24:55 +01:00
stickler-ci
14e3be630c
Fixing style errors.
2021-01-12 20:16:34 +00:00
zuiko
ff06798660
Update mod_barcode_product_standard.php
...
More evolving coding by testing the type of barcode in literal form.
Does not change deeply the #15918 correction principle in order to fix bug #15633 .
2021-01-12 21:14:43 +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
Florian HENRY
f30b303269
Merge branch '12.0' into 13.0
2021-01-12 17:45:54 +01:00
Florian HENRY
5b21702508
extrafeild selllist can be use with string fk
2021-01-12 17:44:22 +01:00