florian HENRY
|
81d86f717d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
|
2020-03-25 12:14:54 +01:00 |
|
VESSILLER
|
c516a54f78
|
FIX get remain to pay with rounding decimals
|
2020-03-25 11:53:47 +01:00 |
|
Laurent Destailleur
|
92db075aa1
|
Add parameter morecss to img_credit_card()
|
2020-03-24 21:40:25 +01:00 |
|
florian HENRY
|
6e4038a051
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
|
2020-03-24 19:50:19 +01:00 |
|
florian HENRY
|
46a4184f15
|
NEW : Project task list, add column selector and extrafields
|
2020-03-24 19:50:01 +01:00 |
|
Laurent Destailleur
|
62fefab5ac
|
Standardize color of status
|
2020-03-24 19:06:37 +01:00 |
|
ptibogxiv
|
06f53fdd69
|
Update html.form.class.php
|
2020-03-24 17:32:50 +01:00 |
|
ptibogxiv
|
8409f3ba4e
|
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
for some business, products have same label so we sometimes need display origin of product for a good choice
|
2020-03-24 17:28:12 +01:00 |
|
gauthier
|
4c0de74470
|
FIX : sort by default role makes no sense
|
2020-03-24 16:27:53 +01:00 |
|
florian HENRY
|
21febcc8fc
|
fix extrafeild creation
|
2020-03-24 16:09:18 +01:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
1ff15e1fd9
|
FIX All forms must use newToken()
|
2020-03-24 13:10:35 +01:00 |
|
Laurent Destailleur
|
2b33ef7e46
|
Align color of graph of status on status color
|
2020-03-24 13:06:59 +01:00 |
|
Laurent Destailleur
|
f56de9f177
|
Fix autocalculation of timespent in monthy mode
|
2020-03-23 22:04:40 +01:00 |
|
Laurent Destailleur
|
063cf15bcb
|
Clean code
|
2020-03-23 20:16:51 +01:00 |
|
Laurent Destailleur
|
c249a1af14
|
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2020-03-23 17:39:09 +01:00 |
|
Laurent Destailleur
|
2a310b09af
|
Fix phpcs
|
2020-03-23 17:24:47 +01:00 |
|
Laurent Destailleur
|
b18d3e5588
|
Fix var not defined
|
2020-03-23 15:58:47 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
01e60562b9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
|
2020-03-23 15:38:10 +01:00 |
|
Laurent Destailleur
|
db6cb2d449
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-23 15:34:03 +01:00 |
|
Laurent Destailleur
|
24dc202022
|
Doc
|
2020-03-23 15:33:52 +01:00 |
|
Laurent Destailleur
|
e4a9763f54
|
Merge pull request #13405 from aspangaro/12.0_a25
Qual: Move supplier proposal menu to the core
|
2020-03-23 15:17:10 +01:00 |
|
Laurent Destailleur
|
2177afecd9
|
Sort order
|
2020-03-23 14:12:48 +01:00 |
|
Alexandre SPANGARO
|
89de39f199
|
Move supplier proposal menu to the core
|
2020-03-23 08:51:38 +01:00 |
|
Laurent Destailleur
|
94b6fbb223
|
FIX #13300
|
2020-03-22 20:52:00 +01:00 |
|
Laurent Destailleur
|
26e9500c26
|
FIX #13300
|
2020-03-22 20:50:50 +01:00 |
|
Laurent Destailleur
|
c80c247a84
|
Fix phpcs
|
2020-03-22 20:22:33 +01:00 |
|
Laurent Destailleur
|
3eaed6bfc8
|
Fix phpcs
|
2020-03-22 20:22:08 +01:00 |
|
Laurent Destailleur
|
6f3cbe69e8
|
Fix phpcs
|
2020-03-22 19:40:58 +01:00 |
|
Laurent Destailleur
|
700e384639
|
WIP Edit fields into alternate language
|
2020-03-22 19:11:21 +01:00 |
|
Laurent Destailleur
|
b0f3fba71a
|
Fix phpcs
|
2020-03-22 18:27:56 +01:00 |
|
Laurent Destailleur
|
3d6849dfea
|
Fix label of tabs
|
2020-03-22 17:27:08 +01:00 |
|
Laurent Destailleur
|
bcf17c79ef
|
FIX closing tags
|
2020-03-22 02:44:00 +01:00 |
|
Laurent Destailleur
|
c8b05036a4
|
Prepare notif using the notif table
|
2020-03-22 01:24:50 +01:00 |
|
Laurent Destailleur
|
e2acb0c65e
|
code indent
|
2020-03-21 19:37:09 +01:00 |
|
Laurent Destailleur
|
792b9228d3
|
Can search in several different type of containers
|
2020-03-21 19:09:14 +01:00 |
|
Laurent Destailleur
|
83b8497d28
|
Rename sample file so we can use color editor
|
2020-03-21 17:58:03 +01:00 |
|
Laurent Destailleur
|
4ce1665a15
|
Fix charset in RSS export
|
2020-03-21 17:36:07 +01:00 |
|
Laurent Destailleur
|
79086011f8
|
Work on RSS export of blog posts
|
2020-03-21 17:31:44 +01:00 |
|
Laurent Destailleur
|
666b38b44a
|
Fix charset in RSS export
|
2020-03-21 17:31:09 +01:00 |
|
Laurent Destailleur
|
7370268b13
|
Tool to regenerate files
|
2020-03-21 11:04:33 +01:00 |
|
Laurent Destailleur
|
27015fc6f6
|
NEW Add method to add social network sharing buttons on blog posts
|
2020-03-20 19:34:49 +01:00 |
|
Laurent Destailleur
|
a2f9f72973
|
Enhance website module
|
2020-03-20 18:58:45 +01:00 |
|
Laurent Destailleur
|
f904ff5240
|
Add dol_escape_json method
|
2020-03-20 17:10:35 +01:00 |
|
Laurent Destailleur
|
aa1f601528
|
FIX Backto link
|
2020-03-20 16:30:45 +01:00 |
|
Laurent Destailleur
|
a0086d73a1
|
Merge pull request #13371 from aspangaro/12.0_a23
Work on split module fournisseur
|
2020-03-20 10:37:54 +01:00 |
|
Laurent Destailleur
|
0574e1df9f
|
Merge pull request #13386 from aspangaro/12.0_a24
FIX: Load the translation file for extrafields
|
2020-03-20 10:05:41 +01:00 |
|
Laurent Destailleur
|
5ffc57f3f0
|
Update extrafields.class.php
|
2020-03-20 10:05:08 +01:00 |
|
Laurent Destailleur
|
222556b464
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
|
2020-03-19 22:09:17 +01:00 |
|
Laurent Destailleur
|
03b261d54c
|
Provide information of thirdparty, contact or project to SMS handler
|
2020-03-19 19:11:34 +01:00 |
|
Laurent Destailleur
|
c71da5d013
|
FIX mass action on stock movements
|
2020-03-19 15:43:06 +01:00 |
|
Laurent Destailleur
|
7eb4522636
|
FIX missing token and save of survey description
|
2020-03-19 11:59:57 +01:00 |
|
Alexandre SPANGARO
|
a6227aeb6a
|
FIX: Load the translation file for extrafields
|
2020-03-19 11:53:42 +01:00 |
|
Alexandre SPANGARO
|
bac099dc60
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
|
2020-03-19 11:48:21 +01:00 |
|
Laurent Destailleur
|
8e1ffa5144
|
Fix management of token
|
2020-03-19 10:52:07 +01:00 |
|
Laurent Destailleur
|
fca6d45baa
|
NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
instead.
|
2020-03-19 10:15:34 +01:00 |
|
Laurent Destailleur
|
c94c33696a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-19 09:58:04 +01:00 |
|
Laurent Destailleur
|
d38c6616e6
|
Doc
|
2020-03-19 09:53:20 +01:00 |
|
Laurent Destailleur
|
21de447d9e
|
Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility
NEW "contact_civility" for ODT templates
|
2020-03-18 19:31:10 +01:00 |
|
Laurent Destailleur
|
8fa505422e
|
Merge pull request #13378 from atm-florian/develop
NEW: Export module, add extrafields for Contract and Contract line
|
2020-03-18 19:27:24 +01:00 |
|
Laurent Destailleur
|
87edf27bbf
|
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
|
2020-03-18 19:12:52 +01:00 |
|
Laurent Destailleur
|
2c3bd78095
|
Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep
new : Add hook on select user or sales rep
|
2020-03-18 18:56:56 +01:00 |
|
Laurent Destailleur
|
3f4a7b2387
|
Merge pull request #13350 from TobiasSekan/FixMissingUserInOdtSupProposal
FIX missing "contact_" substitution in supplier proposal (ODT template)
|
2020-03-18 18:55:03 +01:00 |
|
Laurent Destailleur
|
3b1c02ae46
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-18 18:51:05 +01:00 |
|
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
|
a3328c5ef3
|
Fix div
|
2020-03-18 18:37:44 +01:00 |
|
Laurent Destailleur
|
e639e24993
|
Merge pull request #13352 from aspangaro/12.0_a22
FIX Update fiscalyear.class.php to filter on entity
|
2020-03-18 18:19:02 +01:00 |
|
florian HENRY
|
15614abc3f
|
NEW: add csv separator setup in module admin
|
2020-03-18 15:08:58 +01:00 |
|
Laurent Destailleur
|
cc93a40c45
|
Fix label of local tax
|
2020-03-18 14:06:15 +01:00 |
|
florian HENRY
|
50a0bfef64
|
NEW: Export module, add extrafields for Contract and Contract line
|
2020-03-18 09:53:13 +01:00 |
|
Laurent Destailleur
|
a76392f944
|
Responsive
|
2020-03-17 21:26:25 +01:00 |
|
Alexandre SPANGARO
|
033f796398
|
Work on split module fournisseur
|
2020-03-17 14:51:48 +01:00 |
|
Laurent Destailleur
|
76fc722638
|
NEW Can get some variables (not available by default)
|
2020-03-17 13:33:21 +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
|
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
|
4b1dd27c5f
|
Move takepos.php file into index.php to match other dir structure
|
2020-03-16 15:41:21 +01:00 |
|
Alexandre SPANGARO
|
6b168428d8
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a22
|
2020-03-16 12:11:01 +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 |
|
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 |
|
Tobias Sekan
|
c50f2b32d8
|
Add substitution for "user_civility" for ODT
|
2020-03-16 07:58:44 +01:00 |
|
Laurent Destailleur
|
22e8fdb46b
|
Enhance #13033
|
2020-03-15 13:57:31 +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
|
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
|
a437125962
|
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
NEW add numbering module for cash desk
|
2020-03-13 16:58:27 +01:00 |
|
Laurent Destailleur
|
99669583d5
|
Fix phpcs
|
2020-03-13 16:46:07 +01:00 |
|
Laurent Destailleur
|
d90bf25351
|
Fix phpcs
|
2020-03-13 13:11:04 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Laurent Destailleur
|
52290b002a
|
NEW Another way to navigate between pages for some lists
|
2020-03-13 12:53:22 +01:00 |
|
Laurent Destailleur
|
893ae21d3a
|
Fix phpcs
|
2020-03-13 11:29:27 +01:00 |
|
Laurent Destailleur
|
d3447bb44b
|
Fix duplicate /
|
2020-03-13 10:14:26 +01:00 |
|
Laurent Destailleur
|
4bd1c6c717
|
Fix hreflink
|
2020-03-13 09:51:41 +01:00 |
|
VESSILLER
|
826ed67921
|
FIX travis errors sql escape
|
2020-03-13 09:01:22 +01:00 |
|