Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +01:00 |
|
Florian Mortgat
|
4846885eea
|
NEW 9.0: enable user to use the mysqldump '--quick' option
(useful if the server has low RAM or large tables)
|
2019-12-02 16:54:05 +01:00 |
|
Laurent Destailleur
|
c692650430
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-02 15:23:40 +01:00 |
|
Laurent Destailleur
|
66571df449
|
Fix remove a link that is private
|
2019-12-02 15:19:14 +01:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
Laurent Destailleur
|
a6408ce9b6
|
Typo
|
2019-12-01 13:05:22 +01:00 |
|
Laurent Destailleur
|
eb69538d17
|
Fix if we insert a product already the product to produce
|
2019-11-29 23:51:46 +01:00 |
|
Laurent Destailleur
|
d374ce99a1
|
Trans
|
2019-11-28 13:20:09 +01:00 |
|
Cédric
|
45bf3e4df9
|
Merge branch 'develop' into patch-3
|
2019-11-28 13:11:52 +01:00 |
|
Frédéric FRANCE
|
b2912e688b
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-27 22:54:05 +01:00 |
|
Laurent Destailleur
|
cb352407eb
|
Add submit
|
2019-11-26 12:46:40 +01:00 |
|
Laurent Destailleur
|
4ef6c9cc13
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
|
2019-11-26 11:54:42 +01:00 |
|
Laurent Destailleur
|
9d2a5e6c42
|
Trans
|
2019-11-26 09:08:32 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Alexandre SPANGARO
|
60f19d134c
|
Fix Ticket - Align language type with datas for translation
|
2019-11-26 03:58:01 +01:00 |
|
Laurent Destailleur
|
a8c2aa094d
|
More examples
|
2019-11-25 20:30:05 +01:00 |
|
Laurent Destailleur
|
61f414488a
|
Fix translation
|
2019-11-24 18:34:07 +01:00 |
|
Cédric
|
950a32a433
|
Checkbox label delete child product FR
|
2019-11-23 18:11:20 +01:00 |
|
Cédric
|
b959e59554
|
Checkbox label delete child product EN
|
2019-11-23 18:09:17 +01:00 |
|
atm-greg
|
ce15af0980
|
manage packaging on supplier prices
|
2019-11-23 15:52:34 +01:00 |
|
Laurent Destailleur
|
32f590f274
|
Merge pull request #12485 from aspangaro/12.0_a2
NEW Add shipment widget
|
2019-11-22 14:39:56 +01:00 |
|
Laurent Destailleur
|
383f095063
|
Fix trans
|
2019-11-22 09:45:14 +01:00 |
|
Alexandre SPANGARO
|
2f064567ef
|
NEW Add shipment widget
|
2019-11-21 07:50:44 +01:00 |
|
Frédéric FRANCE
|
d182eee4bf
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-19 23:26:00 +01:00 |
|
Laurent Destailleur
|
5d7a1f1265
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
|
2019-11-19 19:02:14 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Alexandre SPANGARO
|
79ee2b8c4d
|
Missing language key
|
2019-11-18 11:48:44 +01:00 |
|
Laurent Destailleur
|
662c622432
|
Debug MRP
|
2019-11-17 00:37:08 +01:00 |
|
Frédéric FRANCE
|
6784ea9fae
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-16 09:21:57 +01:00 |
|
Laurent Destailleur
|
4fc7b8c3b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/extrafields_list_search_title.tpl.php
|
2019-11-14 12:49:42 +01:00 |
|
Laurent Destailleur
|
a29adc94f3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/card.php
htdocs/langs/en_US/admin.lang
|
2019-11-14 12:48:33 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Frédéric FRANCE
|
05ab4f79ef
|
categories for actioncomm
|
2019-11-13 18:44:11 +01:00 |
|
Alexandre SPANGARO
|
85e2546019
|
Missing language key
|
2019-11-13 15:25:23 +01:00 |
|
Alexandre SPANGARO
|
0497c399d7
|
Missing language key
|
2019-11-13 14:59:07 +01:00 |
|
Laurent Destailleur
|
4340f85e3c
|
Add warning
|
2019-11-13 01:22:13 +01:00 |
|
Laurent Destailleur
|
56c2dc2614
|
Reduce need of translations
|
2019-11-12 22:29:36 +01:00 |
|
Laurent Destailleur
|
2c718af26c
|
Missing container type 'menu'
Fix: Add security if container is not a page
|
2019-11-12 13:55:46 +01:00 |
|
Laurent Destailleur
|
6afc84fe72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-12 10:20:55 +01:00 |
|
Laurent Destailleur
|
944a15d06b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-12 10:20:16 +01:00 |
|
Laurent Destailleur
|
f8e8d15606
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-12 10:19:01 +01:00 |
|
Laurent Destailleur
|
79cc3f189d
|
Work on BOM
|
2019-11-11 20:56:28 +01:00 |
|
Laurent Destailleur
|
40d66489ad
|
Trans
|
2019-11-11 13:47:17 +01:00 |
|
Laurent Destailleur
|
3054177e79
|
Fix type of tickets
|
2019-11-10 12:28:30 +01:00 |
|
Laurent Destailleur
|
880ecda098
|
Fix name of tables
|
2019-11-10 12:23:21 +01:00 |
|
Laurent Destailleur
|
ad2ff551fa
|
Fix trans
|
2019-11-08 10:35:34 +01:00 |
|
Laurent Destailleur
|
d1c49c7021
|
Fix trans
|
2019-11-08 10:24:03 +01:00 |
|
Laurent Destailleur
|
9607f61df5
|
Merge pull request #12349 from frederic34/patch-13
Update agenda.lang
|
2019-11-07 11:29:59 +01:00 |
|
Laurent Destailleur
|
883fcd7a72
|
Update agenda.lang
|
2019-11-07 11:29:45 +01:00 |
|
Laurent Destailleur
|
7144740dfe
|
Merge pull request #12360 from grandoc/new_branch_06_11_2019
fix error message
|
2019-11-07 11:24:15 +01:00 |
|
Laurent Destailleur
|
74f2983ee1
|
Debug modulebuilder
|
2019-11-06 19:38:51 +01:00 |
|
Philippe GRAND
|
1b7fe9a427
|
fix error message
|
2019-11-06 10:40:21 +01:00 |
|
Frédéric FRANCE
|
df77370a63
|
Update agenda.lang
|
2019-11-05 22:01:06 +01:00 |
|
Frédéric FRANCE
|
7d24610d4c
|
Update agenda.lang
|
2019-11-05 21:57:11 +01:00 |
|
Laurent Destailleur
|
0ef249ea52
|
Debug module BOM
|
2019-11-05 18:06:33 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
17ea978cea
|
Merge pull request #12306 from frederic34/escpos
Escpos
|
2019-11-04 20:40:12 +01:00 |
|
Laurent Destailleur
|
dbb90914bc
|
Better Trans
|
2019-11-04 19:53:27 +01:00 |
|
Frédéric FRANCE
|
6ad983bb7b
|
Merge remote-tracking branch 'upstream/develop' into escpos
|
2019-11-04 18:52:29 +01:00 |
|
Laurent Destailleur
|
a0db0fccbe
|
Debug BOM
|
2019-11-04 15:56:45 +01:00 |
|
Laurent Destailleur
|
8aa2fd04ad
|
NEW The integrity checker now show the expected size of files
|
2019-11-04 13:23:48 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Frédéric FRANCE
|
d797ea590e
|
rework an experimental module
|
2019-11-03 00:50:58 +01:00 |
|
Laurent Destailleur
|
2ee002fc80
|
Fix trans
|
2019-11-02 17:44:58 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
bd4d7b3505
|
Merge pull request #12268 from atm-john/develop_fix_fatal_hookmanager
FIX fatal error missing global
|
2019-11-02 13:07:34 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +01:00 |
|
Laurent Destailleur
|
a95a10b8f0
|
Update doc
|
2019-11-01 18:45:44 +01:00 |
|
Laurent Destailleur
|
012c5ef0c4
|
Can use substitution variables into filter of fields link
|
2019-11-01 18:35:48 +01:00 |
|
Laurent Destailleur
|
2af23aa658
|
Enhance modulebuilder
|
2019-11-01 17:54:17 +01:00 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Laurent Destailleur
|
fb95d14aeb
|
Work on MO
|
2019-10-31 23:02:51 +01:00 |
|
Laurent Destailleur
|
716c2bb531
|
Work on MO
|
2019-10-31 22:46:34 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
John Botella
|
f626f249cf
|
Fix missing lang
|
2019-10-30 15:40:06 +01:00 |
|
Laurent Destailleur
|
6a01132fdb
|
Merge pull request #12210 from grandoc/new_branch_24_10_2019
add some comment
|
2019-10-30 03:17:21 +01:00 |
|
Laurent Destailleur
|
beb85ee3a8
|
Work on MO
|
2019-10-30 00:56:57 +01:00 |
|
Laurent Destailleur
|
66337ec234
|
NEW Add widgets for BOMs and MOs
|
2019-10-30 00:36:47 +01:00 |
|
Frédéric FRANCE
|
30d416f8c0
|
Update agenda.lang
|
2019-10-28 20:16:27 +01:00 |
|
Frédéric FRANCE
|
1ba9612f12
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-27 17:03:50 +01:00 |
|
Laurent Destailleur
|
7f1b67f0e4
|
Add warehouse for production on MO
|
2019-10-27 16:28:03 +01:00 |
|
Laurent Destailleur
|
afa3ed499f
|
Can export BOMs
|
2019-10-27 15:56:20 +01:00 |
|
Laurent Destailleur
|
eb112d4012
|
Add qty frozen and disable stock change flag on BOM
|
2019-10-27 01:49:31 +02:00 |
|
Laurent Destailleur
|
f060ef1018
|
FIX Clean decimal data for module builder
|
2019-10-27 00:01:16 +02:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Philippe GRAND
|
dde9dcbee3
|
missing translation
|
2019-10-24 16:29:27 +02:00 |
|
Laurent Destailleur
|
88e848e346
|
FIX Extrafields missing in export of expense report
|
2019-10-24 16:00:10 +02:00 |
|
Laurent Destailleur
|
15609e319f
|
FIX Extrafields missing in export of expense report
|
2019-10-24 15:57:34 +02:00 |
|
Laurent Destailleur
|
64ac113761
|
Show dictionaries of a module in module builder
|
2019-10-24 14:56:43 +02:00 |
|
Laurent Destailleur
|
2201b11fd3
|
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
|
2019-10-24 13:41:04 +02:00 |
|
Laurent Destailleur
|
6fa3b53cf7
|
NEW Module builder can generate CSS of JS file.
|
2019-10-24 11:41:36 +02:00 |
|
Laurent Destailleur
|
da00591bba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2019-10-23 04:04:32 +02:00 |
|
Laurent Destailleur
|
f23804a091
|
FIX #12152
|
2019-10-23 03:00:19 +02:00 |
|
Laurent Destailleur
|
0180014d4d
|
Fix link in popup of shipment
|
2019-10-23 01:35:32 +02:00 |
|
Laurent Destailleur
|
fea12076ee
|
FIX #12152
|
2019-10-22 20:24:52 +02:00 |
|
Laurent Destailleur
|
6079a4d159
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/langs/en_US/main.lang
|
2019-10-22 15:25:31 +02:00 |
|
Tim Otte
|
ceb3482204
|
Requested changes implemented
|
2019-10-22 11:36:28 +02:00 |
|
Laurent Destailleur
|
c5490e22d1
|
Fiw trans
|
2019-10-22 02:58:55 +02:00 |
|
Laurent Destailleur
|
8e474701c1
|
Fix missing token
|
2019-10-21 15:49:08 +02:00 |
|
Laurent Destailleur
|
b21bca17de
|
Add button Save and stay when editing property of web site
|
2019-10-21 00:55:52 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
5a4960f7ae
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
|
2019-10-20 15:30:28 +02:00 |
|
Laurent Destailleur
|
bf1b2242ea
|
Fix no focus if we are on edit mode directly
|
2019-10-20 13:22:29 +02:00 |
|
Frédéric FRANCE
|
f9c0e63f16
|
Update main.lang
|
2019-10-17 22:59:52 +02:00 |
|
Frédéric FRANCE
|
aeafdae34c
|
Update main.lang
|
2019-10-17 22:58:47 +02:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
87ec1de78e
|
Start to work on solution to sort permissions by module
|
2019-10-17 18:43:07 +02:00 |
|
Laurent Destailleur
|
40fdcfac7e
|
Merge branch 'develop' into 10.0_closure2
|
2019-10-17 18:16:57 +02:00 |
|
Laurent Destailleur
|
1a419a6eb6
|
Fix translation
|
2019-10-17 15:15:16 +02:00 |
|
Laurent Destailleur
|
084ab53b4b
|
Fix translation
|
2019-10-17 12:14:38 +02:00 |
|
Gildas
|
7ccc07c05f
|
Fix translation typo in stocks
|
2019-10-17 12:11:01 +02:00 |
|
Laurent Destailleur
|
7d965e8b92
|
Merge pull request #12139 from frederic34/patch-17
translation for ORDER_SUPPLIER_DELETEInDolibarr
|
2019-10-16 13:22:46 +02:00 |
|
Laurent Destailleur
|
ffc4820970
|
Fix counter of BOM
|
2019-10-16 02:05:23 +02:00 |
|
Laurent Destailleur
|
b0355dd149
|
Module BOM have now status DRAFT, VALIDATED, DISABLED
|
2019-10-16 01:20:58 +02:00 |
|
Laurent Destailleur
|
12f1962085
|
Better error message when module file is corrupted
|
2019-10-16 00:40:42 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Frédéric FRANCE
|
00bac9e989
|
Update interface_50_modAgenda_ActionsAuto.class.php
Update agenda.lang
Update agenda.lang
Update interface_50_modAgenda_ActionsAuto.class.php
|
2019-10-15 09:38:24 +02:00 |
|
Laurent Destailleur
|
fb3d20107c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
|
2019-10-15 03:51:57 +02:00 |
|
Frédéric FRANCE
|
2351750d2b
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-14 19:02:46 +02:00 |
|
Laurent Destailleur
|
4fd12e22cb
|
Fix trans export
|
2019-10-14 12:27:44 +02:00 |
|
Laurent Destailleur
|
a33fb47777
|
Work on MO module
|
2019-10-14 12:10:14 +02:00 |
|
Laurent Destailleur
|
7973b03201
|
NEW Add estimated duration on the BOM module
|
2019-10-14 11:38:36 +02:00 |
|
Frédéric FRANCE
|
d9ba09bec1
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 19:02:24 +02:00 |
|
Laurent Destailleur
|
9871dd8770
|
Debug variants
|
2019-10-12 15:27:06 +02:00 |
|
Laurent Destailleur
|
dccfdad9dd
|
Work on inventory feature
|
2019-10-12 11:32:47 +02:00 |
|
Laurent Destailleur
|
dfaf2ae34b
|
Trans
|
2019-10-11 19:20:52 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
78bfc8997d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/link.class.php
|
2019-10-11 16:14:29 +02:00 |
|
Laurent Destailleur
|
85a4bac9e0
|
Better translation
|
2019-10-11 15:22:12 +02:00 |
|
Laurent Destailleur
|
60395f2a9c
|
NEW Look and feel v11: Some setup pages are by default on edit mode
|
2019-10-11 14:09:26 +02:00 |
|
Laurent Destailleur
|
4db57f53f9
|
typo
|
2019-10-11 11:39:33 +02:00 |
|
Laurent Destailleur
|
de107fb02e
|
NEW Can set a squarred icon on your company setup
|
2019-10-11 11:27:05 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Frédéric FRANCE
|
02b706f9c0
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-09 13:40:46 +02:00 |
|
Laurent Destailleur
|
a26281dab3
|
Merge pull request #12066 from fuhraih/feature1
NEW #4301
|
2019-10-09 11:52:45 +02:00 |
|
Laurent Destailleur
|
f83cc0bcfd
|
Picto of user umage larger
|
2019-10-08 21:02:59 +02:00 |
|
Laurent Destailleur
|
6de31f2c54
|
Better translation
|
2019-10-08 19:35:50 +02:00 |
|
Laurent Destailleur
|
8921a103c1
|
Trans
|
2019-10-08 19:25:54 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
b13d5aafb3
|
Trans
|
2019-10-08 15:45:37 +02:00 |
|
Laurent Destailleur
|
328abc4048
|
Clean code
|
2019-10-08 15:43:44 +02:00 |
|
fuhraih
|
eb20341328
|
Update companies.lang
|
2019-10-08 15:42:59 +02:00 |
|
Laurent Destailleur
|
37795b1955
|
Trans
|
2019-10-08 15:40:07 +02:00 |
|
Laurent Destailleur
|
ef91e0bff3
|
Trans
|
2019-10-08 15:35:36 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
16eeeecb9a
|
Trans
|
2019-10-07 17:08:08 +02:00 |
|
Laurent Destailleur
|
c83f40fc7e
|
Debug contact by default
|
2019-10-07 15:42:37 +02:00 |
|
Laurent Destailleur
|
c6c498fd67
|
Merge pull request #11829 from atm-florian/dev_contactdefault
NEW : Address/Contact by default on third parties
|
2019-10-07 15:27:58 +02:00 |
|
Laurent Destailleur
|
a9c844460b
|
Debug use of widget on Accounting home page
|
2019-10-07 14:39:29 +02:00 |
|
Laurent Destailleur
|
035da6a711
|
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
|
2019-10-07 14:24:22 +02:00 |
|
Laurent Destailleur
|
00df21cf17
|
Trans
|
2019-10-07 13:48:09 +02:00 |
|
Laurent Destailleur
|
2bb55200f7
|
Clean user card
|
2019-10-07 13:46:13 +02:00 |
|
Laurent Destailleur
|
76aef85ee4
|
Merge pull request #12015 from atm-maxime/new_validators
NEW expense request and holiday validator fields
|
2019-10-07 13:31:20 +02:00 |
|
Laurent Destailleur
|
f4b752ee81
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/expedition/card.php
|
2019-10-07 12:33:13 +02:00 |
|
Laurent Destailleur
|
b9ac8295d4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-10-07 12:28:06 +02:00 |
|
Laurent Destailleur
|
55508e25ec
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-10-07 12:27:06 +02:00 |
|
Frédéric FRANCE
|
52da21912b
|
Update agenda.lang
|
2019-10-06 13:21:04 +02:00 |
|
Frédéric FRANCE
|
21dcc549fa
|
translation for holidays actioncomm
|
2019-10-06 10:09:06 +02:00 |
|
Maxime Kohlhaas
|
2068692f40
|
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_validators
|
2019-10-05 22:25:06 +02:00 |
|
Maxime Kohlhaas
|
848b9cc57a
|
Translations
|
2019-10-05 22:24:59 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
031c5523d4
|
NEW Add link to the public interface on the ticket card.
|
2019-10-05 11:52:30 +02:00 |
|
florian HENRY
|
2d3dd9ed3c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-10-04 18:10:16 +02:00 |
|
Frédéric FRANCE
|
0383fdbeee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 18:37:14 +02:00 |
|
Laurent Destailleur
|
ad4aa39ec5
|
Merge pull request #11986 from atm-john/develop_dropdown_bookmark
NEW : dropdown bookmark and search
|
2019-10-03 18:18:31 +02:00 |
|
Laurent Destailleur
|
74d3850ec8
|
Merge pull request #12030 from altatof/fckticket
NEW : FCKeditor setup for tickets
|
2019-10-03 17:49:59 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
altairis
|
699a3391c9
|
FCKeditor setup for tickets
|
2019-10-03 16:51:05 +02:00 |
|
Sebastien Baguet
|
d11bb9570c
|
Add French and English translation
|
2019-10-03 13:44:40 +02:00 |
|
John Botella
|
135621c02b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
|
2019-10-03 08:51:22 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Alexandre SPANGARO
|
a6e429ff32
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-10-02 08:49:00 +02:00 |
|
Alexandre SPANGARO
|
4d5547636d
|
Accountancy FAQ - Move to toggle()
|
2019-10-02 08:43:35 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
florian HENRY
|
d48f0fa791
|
resolve conflixt
|
2019-10-01 18:07:59 +02:00 |
|
Frédéric FRANCE
|
5821caa7fc
|
work on migration script
|
2019-10-01 18:02:39 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
John Botella
|
2edc3ffe4b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
|
2019-10-01 08:50:34 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Alexandre SPANGARO
|
f91513937a
|
Remove option to hide FAQ
|
2019-09-30 21:37:20 +02:00 |
|
Alexandre SPANGARO
|
8dea427f58
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-09-30 21:23:27 +02:00 |
|
Frédéric FRANCE
|
31418c2e42
|
check php-calendar extension
|
2019-09-30 21:14:25 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Frédéric FRANCE
|
fec67aade4
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 18:44:34 +02:00 |
|
Laurent Destailleur
|
0e73beaccc
|
Merge pull request #11987 from andreubisquerra/master
Custome receipt tab in TakePOS
|
2019-09-30 18:03:03 +02:00 |
|
Laurent Destailleur
|
48fc165026
|
Trans
|
2019-09-30 17:15:05 +02:00 |
|
John Botella
|
61c8e8ec0c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
|
2019-09-30 17:13:54 +02:00 |
|
Laurent Destailleur
|
d65af06d20
|
Merge pull request #11869 from atm-john/new_ticket_messaging_page
New ticket messaging page design
|
2019-09-30 15:34:35 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
andreubisquerra
|
34be514326
|
Custom receipt tab in TakePOS
|
2019-09-29 20:56:24 +02:00 |
|
ATM john
|
cd821261e8
|
Add global search dropdown
|
2019-09-29 18:56:28 +02:00 |
|
Laurent Destailleur
|
266aace5d1
|
Trans
|
2019-09-29 18:55:48 +02:00 |
|
Laurent Destailleur
|
0f2b36bb82
|
Work on MRP module
|
2019-09-29 18:39:52 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Alexandre SPANGARO
|
8e42ac8cd0
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-09-28 22:31:08 +02:00 |
|
Laurent Destailleur
|
a19fd8507e
|
Trans
|
2019-09-28 13:47:51 +02:00 |
|
Laurent Destailleur
|
db32ca99c6
|
Fix translation and sql request
|
2019-09-28 12:36:09 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
florian HENRY
|
885d958e63
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-27 20:12:09 +02:00 |
|
Laurent Destailleur
|
c0e7c558a1
|
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception
NEW widget box for supplier orders awaiting reception
|
2019-09-27 15:32:43 +02:00 |
|
Laurent Destailleur
|
a79c4608d6
|
Merge pull request #11934 from atm-quentin/NEW_stock_categories
NEW Categories/Tags are also available on warehouses
|
2019-09-27 12:41:28 +02:00 |
|
Laurent Destailleur
|
881c90ab74
|
Merge pull request #11953 from grandoc/new_branch_24_09_2019
add missing translation
|
2019-09-27 11:56:01 +02:00 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +02:00 |
|
Laurent Destailleur
|
ba1275332d
|
Fix thousand separator for fr_NC
|
2019-09-25 13:03:43 +02:00 |
|
Frédéric FRANCE
|
41cb628d05
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-25 08:06:44 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
7b3e64d67f
|
NEW Support of Extrafields on Leave requests.
|
2019-09-24 12:01:18 +02:00 |
|
Philippe GRAND
|
7ec43e8b59
|
add missing translation
|
2019-09-24 09:54:57 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
a005408d83
|
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
|
2019-09-23 20:42:50 +02:00 |
|
Laurent Destailleur
|
d22a1e2571
|
Use space
|
2019-09-23 19:44:05 +02:00 |
|
atm-quentin
|
80d5be56f6
|
Fix trans
|
2019-09-19 16:26:53 +02:00 |
|
atm-quentin
|
c09f2d8c4e
|
NEW stock categories
|
2019-09-19 16:21:03 +02:00 |
|
Laurent Destailleur
|
ad3d21578c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-09-18 13:13:02 +02:00 |
|
Laurent Destailleur
|
2da5071642
|
Fix VAT in New caledonia is now called TGC
|
2019-09-18 13:12:22 +02:00 |
|
Frédéric FRANCE
|
850b9fd52a
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-17 08:24:31 +02:00 |
|
John Botella
|
010e58d957
|
Add switch view behavior
|
2019-09-16 13:56:07 +02:00 |
|
Laurent Destailleur
|
0194f48041
|
Merge pull request #10795 from altatof/clonecat
NEW : copy linked categories on product clone process
|
2019-09-15 16:34:42 +02:00 |
|
Laurent Destailleur
|
434ab2965a
|
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
NEW check if a resource is in use in an event
|
2019-09-15 15:47:07 +02:00 |
|
Frédéric FRANCE
|
ff77d613fb
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-15 11:24:13 +02:00 |
|
Laurent Destailleur
|
6c078bdcb0
|
Fix translation
|
2019-09-15 10:53:41 +02:00 |
|
Laurent Destailleur
|
477c0e2aa4
|
Merge pull request #11897 from aspangaro/11.0_colorization
NEW Bank Add an option for colorize background color of debit or credit movement
|
2019-09-15 10:40:34 +02:00 |
|
Alexandre SPANGARO
|
21e27389d4
|
NEW Bank Add an option for colorize background color of debit or credit movement
|
2019-09-14 20:58:12 +02:00 |
|
Frédéric FRANCE
|
904d0ecaee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 18:42:31 +02:00 |
|
Frédéric FRANCE
|
1e652a41af
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 18:41:51 +02:00 |
|
Laurent Destailleur
|
9f6fe0bf5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/orders.lang
|
2019-09-14 18:27:58 +02:00 |
|
Laurent Destailleur
|
3caa1bd43c
|
FIX Debug feature orderstoinvoice for suppliers
|
2019-09-14 18:21:37 +02:00 |
|
Frédéric FRANCE
|
6444c7378f
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 16:40:23 +02:00 |
|
Frédéric FRANCE
|
e5417cccd8
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:40:00 +02:00 |
|
Laurent Destailleur
|
4d1d689fc8
|
Merge pull request #11868 from bafbes/abb100077
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
|
2019-09-14 16:37:16 +02:00 |
|
Frédéric FRANCE
|
c9c7d60fc0
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:37:10 +02:00 |
|
Laurent Destailleur
|
4e4172dd1b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/payment/newpayment.php
|
2019-09-13 18:56:19 +02:00 |
|
Frédéric FRANCE
|
de3a67f5bd
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-12 21:52:06 +02:00 |
|
ATM john
|
859904587f
|
add private support and title buttons
|
2019-09-12 21:17:48 +02:00 |
|
Frédéric FRANCE
|
6f33874d75
|
add entity
|
2019-09-12 21:13:00 +02:00 |
|
Laurent Destailleur
|
a12bd6aec8
|
better translation
|
2019-09-12 18:55:07 +02:00 |
|
Laurent Destailleur
|
56a99f6e6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-12 11:22:13 +02:00 |
|
Abbes Bahfir
|
5183a1ec7a
|
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
|
2019-09-11 22:45:52 +01:00 |
|
Laurent Destailleur
|
3f3282400a
|
FIX SQL syntax error and CSRF check on vat reports
|
2019-09-11 13:57:15 +02:00 |
|
ATM john
|
337194023a
|
Add purchase orders awaiting reception to workboard
|
2019-09-10 22:10:20 +02:00 |
|
ATM john
|
9db2e27289
|
add widget box for supplier orders awaiting reception
|
2019-09-10 21:47:08 +02:00 |
|
florian HENRY
|
ad92efaee1
|
add trans
|
2019-09-09 14:58:29 +02:00 |
|
florian HENRY
|
42cd15400d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-09 14:12:34 +02:00 |
|
Laurent Destailleur
|
d2131a0be8
|
Add filter on usage on project list
|
2019-09-09 14:08:10 +02:00 |
|
florian HENRY
|
bdb297a380
|
resolve conflict
|
2019-09-09 10:15:44 +02:00 |
|
Laurent Destailleur
|
6d38d58000
|
Trans
|
2019-09-08 21:31:10 +02:00 |
|
Laurent Destailleur
|
44cb9738d6
|
Fix trans
|
2019-09-07 14:35:47 +02:00 |
|
Frédéric FRANCE
|
c6a02312a9
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-07 14:19:07 +02:00 |
|
Laurent Destailleur
|
30d2f84eb7
|
Remove a label that is no more used
|
2019-09-07 10:58:20 +02:00 |
|
Laurent Destailleur
|
a481fac289
|
Merge pull request #11793 from altatof/supplierorderstatus
Differentiate supplier orders status
|
2019-09-07 10:54:03 +02:00 |
|
Laurent Destailleur
|
89e1cdff61
|
Debug module datapolicy
|
2019-09-06 19:41:15 +02:00 |
|
Laurent Destailleur
|
09d6826e62
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
|
2019-09-06 14:27:01 +02:00 |
|
Laurent Destailleur
|
bc0b8dfad0
|
FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
|
2019-09-06 14:24:33 +02:00 |
|
Laurent Destailleur
|
57a15b88fa
|
Fix UMR
|
2019-09-06 14:07:42 +02:00 |
|
florian HENRY
|
dff7be59c8
|
mostlyDone
|
2019-09-06 09:22:53 +02:00 |
|
Laurent Destailleur
|
2e8c915b88
|
Fix more consistent setup
|
2019-09-06 02:39:08 +02:00 |
|
Laurent Destailleur
|
80daf29d79
|
Fix conflict between new module reception and old process
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
|
2019-09-06 01:55:22 +02:00 |
|
Laurent Destailleur
|
04adbd8c80
|
Fix conflict between new module reception and old process
Fix inventory record does not need status at creation
|
2019-09-06 01:52:51 +02:00 |
|
Laurent Destailleur
|
37a32af7b0
|
NEW Add dictionary to store public holidays.
|
2019-09-05 20:19:13 +02:00 |
|
Laurent Destailleur
|
50957ab621
|
Sync transifex
|
2019-09-05 16:51:20 +02:00 |
|
Laurent Destailleur
|
8e7f836534
|
Fix trans
|
2019-09-05 16:23:04 +02:00 |
|
Laurent Destailleur
|
92e7d7bb26
|
Fix duplicate translation
|
2019-09-05 16:18:20 +02:00 |
|
Christophe Battarel
|
1cfd5615d3
|
resolv conflict
|
2019-09-05 16:10:23 +02:00 |
|
VESSILLER
|
b70587c150
|
NEW check if a resource is in use in an event
|
2019-09-04 15:14:16 +02:00 |
|
Tim Otte
|
54d0b94b6d
|
Added extrafield support to the product supplier price lines
|
2019-09-04 15:13:42 +02:00 |
|
florian HENRY
|
73c5b9617f
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-03 17:07:59 +02:00 |
|
Laurent Destailleur
|
bd47bd096b
|
NEW Can defined a position of numbering submodules for thirdparties
|
2019-09-03 15:58:20 +02:00 |
|
Laurent Destailleur
|
2c02e4d118
|
Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list
|
2019-09-03 15:28:52 +02:00 |
|
Laurent Destailleur
|
a9bb891760
|
Merge pull request #11767 from aspangaro/11.0_digitaria
NEW Digitaria model for numbering accountancy thirdparty
|
2019-09-03 15:01:10 +02:00 |
|
Laurent Destailleur
|
95f3db1267
|
Fix translation
|
2019-09-03 14:41:39 +02:00 |
|
Florian Mortgat
|
c63a08b71b
|
FIX: display a link to cron/list.php instead of just instructions on how to get there.
Note: will have no impact until translations are updated; French & English updates provided
|
2019-09-03 10:39:40 +02:00 |
|
Laurent Destailleur
|
c068177027
|
Work on search on global site files
|
2019-09-02 16:39:56 +02:00 |
|
florian HENRY
|
405c92640c
|
on going
|
2019-09-02 14:47:32 +02:00 |
|
Laurent Destailleur
|
04057cd83e
|
Prepare reengeneering of project usage
|
2019-09-01 02:02:38 +02:00 |
|
Laurent Destailleur
|
af6e25d928
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-31 12:37:58 +02:00 |
|
Laurent Destailleur
|
7e19a64ff2
|
Sync transifex
|
2019-08-31 02:17:50 +02:00 |
|
Christophe Battarel
|
8c8844d7ae
|
Differentiate supplier orders status
|
2019-08-30 09:33:01 +02:00 |
|
Laurent Destailleur
|
8eae59945d
|
Fix trans
|
2019-08-30 04:19:33 +02:00 |
|
Laurent Destailleur
|
210effc742
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-30 04:18:23 +02:00 |
|
Laurent Destailleur
|
e54dbecf6d
|
Sync transifex
|
2019-08-30 04:17:40 +02:00 |
|
Laurent Destailleur
|
6009601254
|
Use graph for stats on products/services
|
2019-08-30 04:15:24 +02:00 |
|
Laurent Destailleur
|
3b96271bd7
|
Add a warning to avoid headache
|
2019-08-30 02:21:34 +02:00 |
|
Laurent Destailleur
|
a8eb0e87a8
|
Translate
|
2019-08-29 02:11:46 +02:00 |
|
Laurent Destailleur
|
e421b4b698
|
Trans
|
2019-08-28 10:12:39 +02:00 |
|
Laurent Destailleur
|
bb893fd3a8
|
FIX Missing the filter fields in export of expense report and leaves
|
2019-08-27 18:16:34 +02:00 |
|
Laurent Destailleur
|
12a09b8b2a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/invoice.php
|
2019-08-27 15:56:56 +02:00 |
|
Laurent Destailleur
|
1ac9affd82
|
Trans
|
2019-08-27 15:54:44 +02:00 |
|
Alexandre SPANGARO
|
958361b45e
|
Merge branch 'develop' into 11.0_digitaria
|
2019-08-27 14:11:27 +02:00 |
|
Alexandre SPANGARO
|
d7f8df2e45
|
NEW Digitaria model for numbering accountancy thirdparty
|
2019-08-27 14:03:33 +02:00 |
|
Laurent Destailleur
|
7009f036a0
|
Merge pull request #11744 from andreubisquerra/master
Control errors before validate invoice in TakePOS
|
2019-08-26 17:24:03 +02:00 |
|
Laurent Destailleur
|
999db7ed41
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
|
2019-08-26 16:49:25 +02:00 |
|
Laurent Destailleur
|
0c8640bfd9
|
FIX #11752
|
2019-08-26 16:09:20 +02:00 |
|
andreubisquerra
|
5d0dbea920
|
Control errors before validate invoice in TakePOS
|
2019-08-24 16:44:06 +02:00 |
|
Laurent Destailleur
|
1463302bdd
|
Add option to disable the anonymous ping
|
2019-08-23 16:23:31 +02:00 |
|
Laurent Destailleur
|
775dd18b22
|
Merge pull request #11712 from andreubisquerra/master
NEW Add 'Direct Cash Payment' button in TakePOS
|
2019-08-22 11:22:57 +02:00 |
|
Laurent Destailleur
|
30266b00eb
|
Trans
|
2019-08-22 01:25:25 +02:00 |
|
Laurent Destailleur
|
f5aede8256
|
NEW GeoIP v2 support is natively provided.
|
2019-08-21 19:38:45 +02:00 |
|
Laurent Destailleur
|
008bb16c7f
|
Fix trans
|
2019-08-21 03:41:36 +02:00 |
|
andreubisquerra
|
f1b80fc19a
|
Add 'Direct Cash Payment' button in TakePOS
|
2019-08-20 23:44:30 +02:00 |
|
Laurent Destailleur
|
bfe6f4a163
|
Fix RESTRICT_ON_API
|
2019-08-20 20:32:17 +02:00 |
|
Laurent Destailleur
|
fd3f890f7b
|
NEW Can restrict access using DAV module to some host IPs only
|
2019-08-20 14:15:04 +02:00 |
|
Laurent Destailleur
|
65d11704bb
|
Fix Protect DAV when $dolibarr_main_authentication is forceuser
Compatibility with twoauth
|
2019-08-20 13:46:15 +02:00 |
|
Laurent Destailleur
|
fb8e66a662
|
Trans
|
2019-08-19 18:34:54 +02:00 |
|
Laurent Destailleur
|
998c25f8d6
|
Translation
|
2019-08-19 17:08:58 +02:00 |
|
Laurent Destailleur
|
cc3fd0f1f6
|
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
FIX/NEW task widget and add task progress bar
|
2019-08-19 10:05:16 +02:00 |
|
Laurent Destailleur
|
6abfd8b145
|
Fix use short labels for workboard
|
2019-08-19 10:01:42 +02:00 |
|
Laurent Destailleur
|
c989a63360
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/langs/en_US/cashdesk.lang
|
2019-08-18 20:54:06 +02:00 |
|
Laurent Destailleur
|
cef88283b3
|
Fix missing error message
|
2019-08-18 20:52:18 +02:00 |
|
Laurent Destailleur
|
7e4cf224ec
|
Merge branch 'develop' into develop_new_task_progress_bar
|
2019-08-18 05:38:45 +02:00 |
|
Laurent Destailleur
|
3f105a97bf
|
Debug the new workboard
|
2019-08-18 04:56:48 +02:00 |
|
Laurent Destailleur
|
5351d78a96
|
Merge branch 'develop' into develop_new_dashboard
|
2019-08-18 01:26:56 +02:00 |
|
Laurent Destailleur
|
2147d505c3
|
NEW Can restrict API usage to some IP only
|
2019-08-17 21:44:37 +02:00 |
|
Laurent Destailleur
|
b99b49c542
|
Enhance website module
|
2019-08-17 17:39:31 +02:00 |
|
Laurent Destailleur
|
2510c1e5e4
|
Better help text
|
2019-08-16 03:05:55 +02:00 |
|
Laurent Destailleur
|
fa53641221
|
Merge pull request #11551 from atm-quentin/NEW_global_search_product
NEW Add hidden option to set fields for the quick search on products
|
2019-08-15 20:26:05 +02:00 |
|
Laurent Destailleur
|
56bc7b62ff
|
Update products.lang
|
2019-08-15 20:25:08 +02:00 |
|
Laurent Destailleur
|
a346b052e7
|
Enhance help
|
2019-08-15 18:37:57 +02:00 |
|
Laurent Destailleur
|
b5d72edebc
|
Can add more samples of pages. Add an exemple of page with dynamic
content.
|
2019-08-15 18:07:36 +02:00 |
|
Laurent Destailleur
|
f81463af0c
|
Update templates
|
2019-08-15 00:55:47 +02:00 |
|
Laurent Destailleur
|
b2f1cb22e8
|
Add tooltip in website module
|
2019-08-14 23:57:44 +02:00 |
|
Laurent Destailleur
|
2b805cc63d
|
Add tooltip help in CSS edition
|
2019-08-14 23:47:01 +02:00 |
|
Laurent Destailleur
|
8e0a023270
|
FIX Disabling a website does not put it offline
|
2019-08-13 05:05:19 +02:00 |
|
Laurent Destailleur
|
983dc80d9e
|
FIX Disabling a website does not put it offline
|
2019-08-13 05:03:45 +02:00 |
|
Laurent Destailleur
|
7824731f17
|
NEW Add feature to search a string into containers
|
2019-08-13 00:34:42 +02:00 |
|
Laurent Destailleur
|
8ad2081555
|
NEW Can select website templates from available default templates
|
2019-08-12 22:19:24 +02:00 |
|
Laurent Destailleur
|
de1af78ae6
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-12 17:38:54 +02:00 |
|
Laurent Destailleur
|
b3e9cf3be7
|
Sync transifex
|
2019-08-12 17:37:23 +02:00 |
|
Laurent Destailleur
|
86d39b435b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-12 02:42:11 +02:00 |
|
ATM john
|
f10f29f632
|
Add filters
|
2019-08-12 01:01:16 +02:00 |
|
ATM john
|
22c4a1b49e
|
Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar
|
2019-08-11 09:57:13 +02:00 |
|
ATM john
|
09c1289802
|
Fix task widget and improve its display
|
2019-08-10 22:48:07 +02:00 |
|
ATM john
|
527e4dcf46
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar
|
2019-08-10 15:41:49 +02:00 |
|
ATM john
|
3f0f7e2ad5
|
Add progress bar for task list and visual status badges
|
2019-08-10 15:41:21 +02:00 |
|
Laurent Destailleur
|
8647a20c18
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
|
2019-08-10 01:57:43 +02:00 |
|
Laurent Destailleur
|
9c92acadaa
|
Fix lang
|
2019-08-10 01:51:50 +02:00 |
|
Laurent Destailleur
|
2824dee11a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
|
2019-08-10 01:20:17 +02:00 |
|
John Botella
|
4aeaa580ea
|
Add color blind option
|
2019-08-07 11:11:47 +02:00 |
|
John Botella
|
bc0508164b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-06 09:57:49 +02:00 |
|
Frédéric FRANCE
|
baa2e870d0
|
Update admin.lang
found in admin/company.php
|
2019-08-05 11:01:58 +02:00 |
|
Laurent Destailleur
|
b294f22285
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-04 13:07:09 +02:00 |
|
Laurent Destailleur
|
5339bb71ac
|
FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
|
2019-08-03 20:57:21 +02:00 |
|
Laurent Destailleur
|
7f42380f83
|
FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
|
2019-08-03 20:53:57 +02:00 |
|
Laurent Destailleur
|
f3e38f4b09
|
FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
|
2019-08-03 20:53:18 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
John Botella
|
3992256046
|
add missing trans
|
2019-08-02 14:12:17 +02:00 |
|
John Botella
|
83d0f1f27f
|
Add weather
|
2019-08-02 12:22:26 +02:00 |
|
atm-quentin
|
eca1029cd8
|
missing trans
|
2019-08-01 15:22:39 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Laurent Destailleur
|
12b530c418
|
FIX Setup of TakePos was not possible after a clean install
|
2019-08-01 11:27:35 +02:00 |
|
Laurent Destailleur
|
814c405021
|
Add link to retry payment if error
|
2019-08-01 03:54:54 +02:00 |
|
Laurent Destailleur
|
a7390e7e47
|
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
NEW Management of retained warranty on situation invoices
|
2019-07-30 21:53:09 +02:00 |
|
Laurent Destailleur
|
5cbde99871
|
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum
NEW Can edit date or RUM mandate
|
2019-07-30 16:04:57 +02:00 |
|
Laurent Destailleur
|
334e1a6737
|
Merge pull request #11583 from aspangaro/11.0_LDcompta
NEW Accountancy Add export model LDCompta V9 & higher
|
2019-07-30 15:59:43 +02:00 |
|
Maxime Kohlhaas
|
be6ad7b6a4
|
New : can define RUM date on third bank account
|
2019-07-28 17:10:37 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
atm-quentin
|
efd89588e5
|
fix trans
|
2019-07-25 12:21:28 +02:00 |
|
Laurent Destailleur
|
907ba62054
|
Sync transifex
|
2019-07-24 14:59:03 +02:00 |
|
atm-quentin
|
5a385bf1cc
|
ADD extrafields on global search
|
2019-07-24 09:41:02 +02:00 |
|
Laurent Destailleur
|
bf55733678
|
NEW Replace the "info" tab on contract with the more complete "agenda"
tag.
|
2019-07-23 02:45:31 +02:00 |
|
Laurent Destailleur
|
bef3423764
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-07-22 19:12:27 +02:00 |
|
Laurent Destailleur
|
f5afc50067
|
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
|
2019-07-22 18:47:35 +02:00 |
|
Laurent Destailleur
|
f0f0b989e9
|
FIX Add warning when setup is strange
|
2019-07-21 16:41:01 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Laurent Destailleur
|
20e58bdd97
|
FIX Limit of uploaded files (max_post_size was not used)
|
2019-07-20 13:09:25 +02:00 |
|
Alexandre SPANGARO
|
0af1206892
|
Merge branch 'develop' into 11.0_salaries
|
2019-07-19 23:11:06 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +02:00 |
|
Laurent Destailleur
|
48b4aa4c8d
|
Fix link to ticket
|
2019-07-19 18:29:33 +02:00 |
|
Alexandre SPANGARO
|
df73345046
|
NEW Accountancy Add export model LDCompta V9 & higher
|
2019-07-19 17:07:55 +02:00 |
|
Laurent Destailleur
|
1053a9d955
|
Trans
|
2019-07-19 16:49:12 +02:00 |
|
Laurent Destailleur
|
fea810fb3b
|
Trans
|
2019-07-19 13:44:30 +02:00 |
|
Laurent Destailleur
|
14751680d2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-19 13:38:05 +02:00 |
|
Laurent Destailleur
|
2e08c02510
|
Better error management
|
2019-07-19 13:37:28 +02:00 |
|
Laurent Destailleur
|
1f308915ee
|
Fix trans
|
2019-07-19 13:23:17 +02:00 |
|
Laurent Destailleur
|
278c2d7152
|
Enhance the perf page
|
2019-07-19 12:58:21 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
Laurent Destailleur
|
b044d95acf
|
Merge
|
2019-07-18 17:50:15 +02:00 |
|
Laurent Destailleur
|
c1df3ae5c1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-18 11:10:18 +02:00 |
|
Laurent Destailleur
|
a23bae6c96
|
Work to mke the page perf.php public by default.
|
2019-07-18 11:10:09 +02:00 |
|
Laurent Destailleur
|
917799914e
|
Merge pull request #11433 from atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set
|
2019-07-16 13:52:50 +03:00 |
|
Laurent Destailleur
|
6c23154a91
|
FIX #11506
|
2019-07-15 22:59:18 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
ee109ac568
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-05 17:44:50 +02:00 |
|
Laurent Destailleur
|
93d9f73f1d
|
Trans
|
2019-07-05 17:44:31 +02:00 |
|
Laurent Destailleur
|
9b32763919
|
Fix label for report n ledger for transitionnal bank account on tranfer
|
2019-07-05 15:25:29 +02:00 |
|
Laurent Destailleur
|
c3715646e7
|
Missing trans
|
2019-07-04 21:29:27 +02:00 |
|
Laurent Destailleur
|
1c33dd2e75
|
Merge pull request #11436 from fbosman/fbosman-patch-1
Feature request: Extrafields - store computed value #11435
|
2019-07-04 16:23:08 +02:00 |
|
Laurent Destailleur
|
f2c1568d09
|
NEW Extrafields separator can be collapsed or not
|
2019-07-04 15:43:05 +02:00 |
|
atm-florian.m
|
64d1ebf59c
|
FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion.
|
2019-07-04 15:06:39 +02:00 |
|
Frans Bosman
|
f8a5ae90e3
|
Update admin.lang
|
2019-07-03 16:43:47 +02:00 |
|
atm-florian.m
|
3e53a06b2e
|
minor spelling issues
|
2019-07-03 16:17:47 +02:00 |
|
John Botella
|
9c2e83dcae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-07-01 09:51:26 +02:00 |
|
Laurent Destailleur
|
36e240a16d
|
NEW Add statistics on product into contracts
|
2019-06-29 02:03:57 +02:00 |
|
Laurent Destailleur
|
ad53289a19
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-27 20:13:51 +02:00 |
|
Laurent Destailleur
|
63284e0f24
|
Trans
|
2019-06-27 19:42:22 +02:00 |
|
Laurent Destailleur
|
c7db76f05a
|
Trans
|
2019-06-27 19:38:53 +02:00 |
|
Laurent Destailleur
|
ab1f0aba93
|
Fix trans
|
2019-06-27 19:28:40 +02:00 |
|
Laurent Destailleur
|
6136dd6e7c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-27 13:57:08 +02:00 |
|
Laurent Destailleur
|
8c6485fa20
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
ChangeLog
htdocs/compta/facture/card.php
|
2019-06-27 13:56:33 +02:00 |
|
Laurent Destailleur
|
7f9b407c37
|
Sync transifex
|
2019-06-27 13:52:46 +02:00 |
|
Laurent Destailleur
|
84e4def180
|
Transifex sync
|
2019-06-27 13:39:54 +02:00 |
|
Laurent Destailleur
|
244d21bd2b
|
Fix trans
|
2019-06-27 00:45:17 +02:00 |
|
Laurent Destailleur
|
7c73004171
|
Fix trans
|
2019-06-26 13:14:16 +02:00 |
|
John Botella
|
7e14a598e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-26 09:43:43 +02:00 |
|
Laurent Destailleur
|
51a1550dbb
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
|
2019-06-25 23:14:49 +02:00 |
|
Laurent Destailleur
|
70967b4ea1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/class/utils.class.php
|
2019-06-25 20:06:39 +02:00 |
|
Laurent Destailleur
|
d41850c7cd
|
Fix purge of old files
|
2019-06-25 20:02:14 +02:00 |
|
Laurent Destailleur
|
27ad0d1f88
|
Trans
|
2019-06-25 16:35:25 +02:00 |
|
Laurent Destailleur
|
229dd4d3f5
|
Merge branch 'develop' into 10.0_accounting6
|
2019-06-24 19:59:11 +02:00 |
|
Laurent Destailleur
|
604633afd1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-24 18:45:15 +02:00 |
|
Laurent Destailleur
|
35c3eb0d7e
|
Fix conflict in a translation key
|
2019-06-24 17:59:00 +02:00 |
|
Laurent Destailleur
|
bf731e3de6
|
Fix trans
|
2019-06-24 16:30:55 +02:00 |
|
John Botella
|
7b6925b8f7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-24 10:29:43 +02:00 |
|
Laurent Destailleur
|
9c54de57ce
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-23 18:12:56 +02:00 |
|
Laurent Destailleur
|
8866ab5565
|
Fix missing trans
|
2019-06-23 16:42:06 +02:00 |
|
Laurent Destailleur
|
22b91f3693
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 13:28:44 +02:00 |
|
Laurent Destailleur
|
0f808114e5
|
Sync transifex
Fix CSS for Left To Right Languages
|
2019-06-22 13:18:33 +02:00 |
|
Laurent Destailleur
|
b111636ed0
|
Fix trans
|
2019-06-20 18:32:25 +02:00 |
|
Laurent Destailleur
|
8da5794777
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
|
2019-06-20 18:24:43 +02:00 |
|
Laurent Destailleur
|
c521b9b8f8
|
Fix dispatch in ledger table of withdraw / direct debit payment
|
2019-06-20 16:58:51 +02:00 |
|
Laurent Destailleur
|
4ffa48d9bd
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 13:50:47 +02:00 |
|
Laurent Destailleur
|
afb6362317
|
Fix look and feel v10
Fix link to direct debit payment order
|
2019-06-20 13:37:06 +02:00 |
|
Laurent Destailleur
|
e9da44e023
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 12:33:02 +02:00 |
|
Laurent Destailleur
|
1a6dc83d4c
|
Fix: default accounting account for eec and export sales were not used.
|
2019-06-20 12:25:58 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Laurent Destailleur
|
554724a46f
|
Merge pull request #11363 from aspangaro/10.0_other
Translate rights
|
2019-06-20 03:36:16 +02:00 |
|
Laurent Destailleur
|
e99cf13ccf
|
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
|
2019-06-20 03:27:45 +02:00 |
|
Laurent Destailleur
|
382ec1a106
|
Merge pull request #11254 from andreubisquerra/master
Basic phone layout for Restaurants in TakePOS
|
2019-06-20 03:14:23 +02:00 |
|
Laurent Destailleur
|
daab58974e
|
Merge pull request #11366 from aspangaro/10.0_other2
Missing language key
|
2019-06-20 03:02:13 +02:00 |
|
Laurent Destailleur
|
7c4cddf28d
|
Fix missing trad
|
2019-06-19 16:34:01 +02:00 |
|
Laurent Destailleur
|
5b5028254f
|
Fix label
|
2019-06-19 16:30:03 +02:00 |
|
Laurent Destailleur
|
a11c816a17
|
Fix tooltip
|
2019-06-19 14:24:48 +02:00 |
|
Laurent Destailleur
|
f9cc120d75
|
Debug module ticket
|
2019-06-19 12:53:28 +02:00 |
|
Alexandre SPANGARO
|
ffbb14f40e
|
Missing language key
|
2019-06-19 06:28:22 +02:00 |
|
Alexandre SPANGARO
|
13836d3e21
|
Missing language ley
|
2019-06-19 06:21:53 +02:00 |
|
Alexandre SPANGARO
|
f91c40a45c
|
Translate rights
|
2019-06-19 06:00:11 +02:00 |
|
Alexandre SPANGARO
|
9234a54468
|
Translate rights
|
2019-06-19 05:49:23 +02:00 |
|
Alexandre SPANGARO
|
e1c476e744
|
Translate rights
|
2019-06-19 05:48:04 +02:00 |
|
Alexandre SPANGARO
|
42b03ec858
|
Translate rights
|
2019-06-18 22:53:50 +02:00 |
|
Alexandre SPANGARO
|
a0ae1e96a3
|
Translate rights
|
2019-06-18 22:52:37 +02:00 |
|
Alexandre SPANGARO
|
4de0a57f5c
|
Translate rights
|
2019-06-18 22:44:43 +02:00 |
|
Alexandre SPANGARO
|
ce37544088
|
Translate rights
|
2019-06-18 22:41:18 +02:00 |
|
Alexandre SPANGARO
|
c59de49894
|
Translate rights
|
2019-06-18 22:38:52 +02:00 |
|
Frédéric FRANCE
|
a399e3f63d
|
Update companies.lang
|
2019-06-17 13:33:44 +02:00 |
|
Frédéric FRANCE
|
baf95c3c86
|
Update agenda.lang
|
2019-06-14 16:47:53 +02:00 |
|
Laurent Destailleur
|
f00c9a10db
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
|
2019-06-13 12:15:51 +02:00 |
|
Laurent Destailleur
|
e81663ec34
|
Fix cropping of image files for BOM module was ko
|
2019-06-12 19:00:34 +02:00 |
|
Laurent Destailleur
|
a7e0589071
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-12 13:59:22 +02:00 |
|
Laurent Destailleur
|
f41606ba15
|
Merge branch '10.0' into 10.0_Differentiated_export
|
2019-06-12 13:27:49 +02:00 |
|
Laurent Destailleur
|
aaed26b9b0
|
Update main.lang
|
2019-06-12 13:04:28 +02:00 |
|
Laurent Destailleur
|
32849db6d8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-06-12 12:10:07 +02:00 |
|
Laurent Destailleur
|
91a4e8bc0a
|
Merge
|
2019-06-12 12:09:56 +02:00 |
|
Alexandre SPANGARO
|
c5ff0894be
|
Accountancy : Fix language key
|
2019-06-10 22:10:49 +02:00 |
|
Alexandre SPANGARO
|
a0ab2fdfd7
|
Fix Missing language key
|
2019-06-09 08:29:44 +02:00 |
|
Alexandre SPANGARO
|
39fa4f9365
|
Fix Missing language key
|
2019-06-08 21:34:30 +02:00 |
|
Laurent Destailleur
|
1520ca9646
|
Fix buttons for payments
|
2019-06-07 13:51:53 +02:00 |
|
Laurent Destailleur
|
e3812e3b0c
|
FIX source template invoice not loaded/shown
|
2019-06-05 08:20:10 +02:00 |
|
John BOTELLA
|
d7a393bbd3
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-04 14:00:18 +02:00 |
|
Laurent Destailleur
|
ba2b07917b
|
Fix look and feel v10
|
2019-06-04 02:11:03 +02:00 |
|
Laurent Destailleur
|
1415ad5b53
|
Debug website module
|
2019-06-02 17:27:00 +02:00 |
|
andreubisquerra
|
45fabede28
|
Basic phone layout for Restaurants in TakePOS
|
2019-05-26 16:44:17 +02:00 |
|
Laurent Destailleur
|
b5b5e1f6db
|
More completepaybox integration with HMAC
|
2019-05-26 14:37:31 +02:00 |
|
Laurent Destailleur
|
410932f3f2
|
Trans
|
2019-05-26 12:01:08 +02:00 |
|
Laurent Destailleur
|
a5865d3e4a
|
Debug BOM
|
2019-05-25 19:29:33 +02:00 |
|
Laurent Destailleur
|
bca5a56db1
|
Merge pull request #11236 from a-schild/develop
Add accountancy export option for Sage50 Swiss
|
2019-05-24 12:52:51 +02:00 |
|
Laurent Destailleur
|
ceba186de8
|
Trans
|
2019-05-23 22:42:26 +02:00 |
|
Alexandre SPANGARO
|
2085958a69
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-23 11:10:07 +02:00 |
|
Alexandre SPANGARO
|
4ba8cf0641
|
Fix
|
2019-05-23 11:08:06 +02:00 |
|
Alexandre SPANGARO
|
d4384f507d
|
WIP
|
2019-05-23 09:25:09 +02:00 |
|
Alexandre SPANGARO
|
65070afce4
|
WIP
|
2019-05-22 17:22:49 +02:00 |
|
a-schild
|
ab646450d6
|
Revert changes in DE/FR/IT languages, since they are generated/maintained via Transifex
|
2019-05-22 17:03:49 +02:00 |
|
Alexandre SPANGARO
|
a182b89bb0
|
Merge branch 'develop' into 10.0_closure2
|
2019-05-22 13:52:13 +02:00 |
|
a-schild
|
445a66ed21
|
Added sage50 swiss translation texts for EN/DE/FR/IT
|
2019-05-22 10:21:35 +02:00 |
|
Laurent Destailleur
|
2c0c1dbef3
|
Debug modulebuilder
|
2019-05-21 16:16:19 +02:00 |
|
Laurent Destailleur
|
eafc35b00f
|
Look and feel v10
|
2019-05-21 13:27:45 +02:00 |
|
Alexandre SPANGARO
|
d9e9cb2ea9
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-20 15:02:05 +02:00 |
|
ATM-Nicolas
|
d58603bd1e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column
|
2019-05-20 09:13:37 +02:00 |
|
ATM-Nicolas
|
6be48e6952
|
NEW : Amount HT invoiced column in propal list
|
2019-05-20 08:59:44 +02:00 |
|
Frédéric FRANCE
|
aef850f6d3
|
zapier for dolibarr
|
2019-05-19 21:12:22 +02:00 |
|
Laurent Destailleur
|
2bbb04085e
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
|
2019-05-19 02:15:01 +02:00 |
|
Maxime Kohlhaas
|
ea4dcbc77a
|
Add translation
|
2019-05-18 17:07:55 +02:00 |
|
Laurent Destailleur
|
b40eb92ce7
|
Mass action for closing members
|
2019-05-18 16:25:45 +02:00 |
|
Laurent Destailleur
|
bd1ed4f7ac
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-16 21:26:20 +02:00 |
|
Laurent Destailleur
|
ced2c7383a
|
Merge pull request #11178 from aspangaro/10.0_openconcerto
NEW Accountancy Add OpenConcerto export format
|
2019-05-16 21:24:14 +02:00 |
|
Laurent Destailleur
|
53b7f3fe92
|
Merge pull request #11173 from aspangaro/10.0_accountancy_cat
NEW Add accoutancy sell intra and export in product import
|
2019-05-16 21:14:46 +02:00 |
|
Alexandre SPANGARO
|
f123f9951f
|
NEW Add OpenConcerto export format
|
2019-05-15 12:16:03 +02:00 |
|
Laurent Destailleur
|
9f8f45d5bc
|
FIX Payment on supplier invoice should not mix credit note and standard
invoices.
|
2019-05-14 12:00:58 +02:00 |
|
Alexandre SPANGARO
|
7c9ccee64d
|
NEW Accountancy - Differentiated export
|
2019-05-14 05:45:36 +02:00 |
|
Alexandre SPANGARO
|
d99424cdf0
|
NEW Add accoutancy sell intra and export in product import
|
2019-05-13 21:19:18 +02:00 |
|
Laurent Destailleur
|
7a75567ad9
|
FIX Debug ticket module
|
2019-05-12 16:34:49 +02:00 |
|
Laurent Destailleur
|
a664cd6461
|
Fix check when uploading a non image as user photo
|
2019-05-10 20:09:41 +02:00 |
|
Laurent Destailleur
|
acc57343a9
|
Trans
|
2019-05-09 18:34:10 +02:00 |
|
Laurent Destailleur
|
78c4a3cced
|
Fix lang
|
2019-05-09 18:33:50 +02:00 |
|
Laurent Destailleur
|
2ff81cd262
|
Fix duplicate key
|
2019-05-09 18:08:23 +02:00 |
|
Laurent Destailleur
|
a5b1de4f6a
|
Fix tab that should not be visible
|
2019-05-09 17:52:55 +02:00 |
|
Laurent Destailleur
|
46b0545c4a
|
Debug module reception
|
2019-05-09 17:26:06 +02:00 |
|
Laurent Destailleur
|
a94c291b76
|
Dolibarization
|
2019-05-09 16:59:06 +02:00 |
|
Laurent Destailleur
|
b8f2f957bf
|
Sync transifex
|
2019-05-09 16:58:31 +02:00 |
|
Laurent Destailleur
|
2ffad20e9f
|
fix typo
|
2019-05-09 16:37:46 +02:00 |
|
Laurent Destailleur
|
9672c7ccca
|
Translation
|
2019-05-09 16:21:53 +02:00 |
|
Laurent Destailleur
|
84714f39e2
|
Fix setup of terminal
|
2019-05-09 13:37:20 +02:00 |
|
Laurent Destailleur
|
6e69db8a1a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
|
2019-05-09 12:27:14 +02:00 |
|
Laurent Destailleur
|
d3bbb93ada
|
Fix template for situation
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
|
2019-05-09 12:16:43 +02:00 |
|
andreubisquerra
|
84cfa00bf1
|
Terminals
|
2019-05-08 18:29:00 +02:00 |
|
Laurent Destailleur
|
1e036f3513
|
Correct support for type price on module builder
Fix link of ref in cash fence list
|
2019-05-08 01:09:38 +02:00 |
|
ATM-Nicolas
|
77d3f22163
|
NEW : Amount invoiced column in propal list
|
2019-05-07 14:39:16 +02:00 |
|
Alexandre SPANGARO
|
4baffae297
|
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
|
2019-05-05 22:43:02 +02:00 |
|
Alexandre SPANGARO
|
4e16992796
|
WIP
|
2019-05-05 14:07:42 +02:00 |
|
Laurent Destailleur
|
60bf3452c3
|
Hide export in EEC for non european countries
|
2019-05-04 12:26:54 +02:00 |
|
Laurent Destailleur
|
3ad478c25e
|
Merge pull request #11109 from aspangaro/develop
NEW Manage account sell_intra & sell_export in page accoutancy admin default product
|
2019-05-04 12:18:23 +02:00 |
|
Laurent Léonard
|
476d15868c
|
Fix civility translation in dutch dict language file
|
2019-05-04 06:25:53 +02:00 |
|
Alexandre SPANGARO
|
0359b1820a
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-05-03 14:10:57 +02:00 |
|
Alexandre SPANGARO
|
61547e3f82
|
NEW Manage account sell_intra & sell_export in page default product
|
2019-05-03 14:08:20 +02:00 |
|
Laurent Destailleur
|
dd4e70efe7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/accountancy/class/lettering.class.php
|
2019-05-03 12:14:17 +02:00 |
|
Laurent Destailleur
|
e694d0b2c2
|
Merge pull request #11101 from aspangaro/9.0_lettering
FIX Massive debug in lettering function
|
2019-05-03 11:39:45 +02:00 |
|
Laurent Destailleur
|
eab49d4300
|
NEW Update Stripe library to 6.34.3
|
2019-05-03 02:22:27 +02:00 |
|
Laurent Destailleur
|
10d853cdb3
|
Work on stripe payment using intent with option
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
|
2019-05-02 21:54:28 +02:00 |
|
Laurent Destailleur
|
8442c86436
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
|
2019-05-02 17:40:41 +02:00 |
|
Laurent Destailleur
|
4899d03ff8
|
FIX Confusion between expired and late
|
2019-05-02 17:15:24 +02:00 |
|
Alexandre SPANGARO
|
cbe23741eb
|
FIX Massive debug in lettering function
|
2019-05-02 14:06:55 +02:00 |
|
Laurent Destailleur
|
e2c7c0574e
|
Merge pull request #11086 from andreubisquerra/master
NEW Add history to view and print previous sales on TakePos.
|
2019-05-02 14:04:57 +02:00 |
|
Laurent Destailleur
|
a75223c850
|
Debug ticket module
|
2019-05-02 13:53:13 +02:00 |
|
Laurent Destailleur
|
e81f10c790
|
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
|
2019-05-02 13:45:49 +02:00 |
|
Laurent Destailleur
|
4a81e8fd62
|
Debug call to apilayer
|
2019-05-02 13:24:28 +02:00 |
|
Laurent Destailleur
|
4756499a81
|
Debug module builder for generation of APIs
|
2019-05-02 12:03:14 +02:00 |
|
Laurent Destailleur
|
90a1181dc5
|
Debug module Ticket
|
2019-05-01 20:41:03 +02:00 |
|
Laurent Destailleur
|
9955af5194
|
Debug ticket module
|
2019-05-01 17:53:41 +02:00 |
|
Laurent Destailleur
|
61bf731d17
|
FIX Balance of td
|
2019-04-30 18:11:35 +02:00 |
|
Laurent Destailleur
|
0cd1fc79f2
|
NEW Add a security permission to edit php dynamic content on website.
|
2019-04-30 13:05:13 +02:00 |
|
Laurent Destailleur
|
3007905508
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modProduct.class.php
htdocs/core/modules/modService.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/stripe/class/stripe.class.php
|
2019-04-30 03:30:40 +02:00 |
|
Laurent Destailleur
|
c12a16abea
|
Fix trans
|
2019-04-30 02:49:13 +02:00 |
|
Laurent Destailleur
|
d55c440740
|
Fix some product and services export profiles
|
2019-04-29 21:23:01 +02:00 |
|
Laurent Destailleur
|
c7fcecc336
|
Fix email not loaded
|
2019-04-29 17:17:25 +02:00 |
|
andreubisquerra
|
00db274956
|
Add history to view and print previous sales.
|
2019-04-28 18:12:33 +02:00 |
|
Laurent Destailleur
|
0c432c28a8
|
Trans
|
2019-04-26 13:08:19 +02:00 |
|
Laurent Destailleur
|
4bd732cc40
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
|
2019-04-25 23:25:21 +02:00 |
|
Laurent Destailleur
|
63c0ab93fb
|
FIX CVE-2019-11201
|
2019-04-25 23:21:25 +02:00 |
|
Laurent Destailleur
|
10dde837d0
|
Debug email collector
|
2019-04-25 19:32:48 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Laurent Destailleur
|
e5c2027dbb
|
NEW Add accounting code for eec sales and export sales on products
|
2019-04-25 01:16:29 +02:00 |
|
Laurent Destailleur
|
fe3fe60efc
|
Cleaner setup page
|
2019-04-24 18:31:11 +02:00 |
|
Laurent Destailleur
|
4d92d7731c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
|
2019-04-23 12:32:08 +02:00 |
|
Laurent Destailleur
|
09914f31f9
|
Trans
|
2019-04-23 12:14:50 +02:00 |
|