Laurent Destailleur
|
bc308fc662
|
Look and feel v13 - Disabled users are greyed
|
2020-10-02 14:19:44 +02:00 |
|
Laurent Destailleur
|
5256229089
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-02 13:51:47 +02:00 |
|
Laurent Destailleur
|
10deb1baad
|
Clean code - Removed no more used files orderstoinvoice.php
|
2020-10-02 13:51:32 +02:00 |
|
Laurent Destailleur
|
230edd5b67
|
Merge pull request #14890 from inoveaconseil/NEWHookPropalcard
New hook propalcard
|
2020-10-02 13:46:53 +02:00 |
|
Laurent Destailleur
|
d297e0b05a
|
Update card.php
|
2020-10-02 13:46:44 +02:00 |
|
Laurent Destailleur
|
00cb3277ec
|
Merge pull request #14891 from inoveaconseil/Newhidelabelvariant
NEW hide label in pdf for variants
|
2020-10-02 13:45:52 +02:00 |
|
Laurent Destailleur
|
7e414fe9da
|
Merge pull request #14889 from frederic34/ecm_extrafields
NEW Add extrafields support on ECM module
|
2020-10-02 13:44:45 +02:00 |
|
Laurent Destailleur
|
193c9ac803
|
Merge pull request #14892 from atm-john/develop_new_search_param_for_order_close_date
NEW Add search param for close date on order list
|
2020-10-02 13:42:02 +02:00 |
|
Laurent Destailleur
|
440ad2035e
|
Merge pull request #14893 from FHenry/develop
Add missing lang file (if order is billed the status icon "billed" is not translated
|
2020-10-02 13:41:23 +02:00 |
|
Laurent Destailleur
|
3c6fcced8e
|
Clean code
|
2020-10-02 13:38:35 +02:00 |
|
Laurent Destailleur
|
86c9c28e7c
|
Merge pull request #14895 from hregis/12.0_ldap
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
|
2020-10-02 13:33:35 +02:00 |
|
Regis Houssin
|
f67189aaa8
|
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
|
2020-10-02 13:16:42 +02:00 |
|
Laurent Destailleur
|
0893f0250a
|
Minor bug fixes
|
2020-10-02 12:54:56 +02:00 |
|
Florian HENRY
|
18c946dc75
|
add missing translation
|
2020-10-02 10:37:02 +02:00 |
|
Florian HENRY
|
1bbd4da0fe
|
add missing translation
|
2020-10-02 10:36:16 +02:00 |
|
stickler-ci
|
a7b4f0ec49
|
Fixing style errors.
|
2020-10-02 07:43:29 +00:00 |
|
John Botella
|
f31e689480
|
Fix new look and feel
|
2020-10-02 09:39:54 +02:00 |
|
Nicolas
|
9e4e027495
|
Hide label
|
2020-10-02 09:39:42 +02:00 |
|
Nicolas
|
85dfb5bf3c
|
Hide the label into pdf document for variants
|
2020-10-02 09:27:01 +02:00 |
|
Nicolas
|
e72fbbfe17
|
Hide the label into pdf document for variants
|
2020-10-02 09:21:44 +02:00 |
|
John Botella
|
ac7a747004
|
Merge branch '12.0_new_search_param_for_order_close_date' into develop
|
2020-10-02 09:19:25 +02:00 |
|
stickler-ci
|
4707ea2a27
|
Fixing style errors.
|
2020-10-02 06:48:14 +00:00 |
|
Nicolas
|
d976d474df
|
NEW Hook on propal card
|
2020-10-02 08:42:48 +02:00 |
|
Inovea Conseil
|
b8b9b73714
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-02 08:38:47 +02:00 |
|
Laurent Destailleur
|
ce0fa53cb0
|
Fix delete of file from file manager
|
2020-10-02 03:07:31 +02:00 |
|
Laurent Destailleur
|
4e49461143
|
code comment
|
2020-10-02 02:11:04 +02:00 |
|
Laurent Destailleur
|
e1d156973b
|
phpcs
|
2020-10-02 02:08:04 +02:00 |
|
Laurent Destailleur
|
813deee4a5
|
Fix phpcs
|
2020-10-02 01:14:43 +02:00 |
|
Frédéric FRANCE
|
16ff15b48c
|
fix
|
2020-10-02 00:29:36 +02:00 |
|
Frédéric FRANCE
|
b78e506e39
|
add files
|
2020-10-02 00:25:44 +02:00 |
|
Frédéric FRANCE
|
7afb62c55d
|
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
|
2020-10-02 00:24:48 +02:00 |
|
Frédéric FRANCE
|
f057488ae3
|
add extrafields on ecm
|
2020-10-02 00:21:13 +02:00 |
|
Laurent Destailleur
|
ce1c5c6873
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/stripe/class/stripe.class.php
htdocs/takepos/invoice.php
|
2020-10-01 19:43:23 +02:00 |
|
Laurent Destailleur
|
8d08290f21
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-01 19:38:11 +02:00 |
|
Laurent Destailleur
|
0fa139f4e3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/takepos/invoice.php
|
2020-10-01 19:37:56 +02:00 |
|
Laurent Destailleur
|
4d134ade72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/takepos/invoice.php
|
2020-10-01 19:35:49 +02:00 |
|
Laurent Destailleur
|
ea3f9e5e64
|
Merge pull request #14873 from OPEN-DSI/v10-fix-takepos-invoice-paid-on-total-discount
FIX set paid on total discount of a product in cash desk
|
2020-10-01 19:32:24 +02:00 |
|
Laurent Destailleur
|
14736bee63
|
Merge pull request #14852 from inovea-conseil/newfieldwebsite
NEW website page fields
|
2020-10-01 19:31:14 +02:00 |
|
Laurent Destailleur
|
ab68d3febe
|
Merge pull request #14864 from aspangaro/13a20
FIX If salaries subledger account not defined, put only in the general account
|
2020-10-01 19:29:29 +02:00 |
|
Laurent Destailleur
|
a0722f2a30
|
Merge pull request #14862 from TobiasSekan/UseObjectFieldsOnContactList
NEW Use object field of contact in contact list (internal)
|
2020-10-01 19:27:49 +02:00 |
|
Laurent Destailleur
|
04bad37564
|
Merge pull request #14858 from TobiasSekan/UseObjectFieldsOnProjectList
NEW Use object field of project in project list (internal)
|
2020-10-01 19:26:42 +02:00 |
|
Laurent Destailleur
|
ed69b6ad15
|
Merge pull request #14863 from bomuux/patch-2
Bug: ActionComm::ref_ext is not saved properly
|
2020-10-01 19:21:28 +02:00 |
|
Laurent Destailleur
|
445e0971ac
|
Merge pull request #14871 from davidNDU/develop
FIX #13979 Module builder: pdf_standard_myobject.modules.php changed specific code (Facture::STATUS_DRAFT), myboject.class.php added $last_main_doc
|
2020-10-01 19:20:15 +02:00 |
|
Laurent Destailleur
|
f79bce638a
|
Merge pull request #14872 from FHenry/develop
fix remove php warning non-numeric value
|
2020-10-01 19:18:11 +02:00 |
|
Laurent Destailleur
|
0ef182216f
|
Merge pull request #14875 from ptibogxiv/patch-366
FIX date and user cloture / closing display
|
2020-10-01 19:15:46 +02:00 |
|
Laurent Destailleur
|
89dfb9baf8
|
Merge pull request #14887 from cfoellmann/fix-origin-user
handle fk_origin for stock movement for users the core way
|
2020-10-01 19:15:01 +02:00 |
|
Laurent Destailleur
|
2625b94c83
|
Merge pull request #14888 from FHenry/12.0
fix CSRF not provided into form file upload ckeditor
|
2020-10-01 19:14:07 +02:00 |
|
Laurent Destailleur
|
26be972b71
|
Merge pull request #14874 from defrance/patch-157
fix typo error
|
2020-10-01 19:12:53 +02:00 |
|
Laurent Destailleur
|
3fca84eab7
|
Merge pull request #14878 from Dushyantsingh-ds/develop
Improve Docs.
|
2020-10-01 19:09:48 +02:00 |
|
Laurent Destailleur
|
580df3d503
|
Merge pull request #14880 from rabib-metroworks/import-proposal
NEW Can import proposals
|
2020-10-01 19:09:14 +02:00 |
|