Laurent Destailleur
9c1e409feb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:35:16 +01:00
Laurent Destailleur
906110dc1d
Fix backup. Recommended compression is gzip.
2020-01-17 11:34:31 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Laurent Destailleur
6318f21a8f
Trans
2020-01-16 15:07:18 +01:00
Tobias Sekan
b79c6fc848
Update German language
2020-01-16 10:38:20 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
8f73bce878
Add warning if zip lib missing
2020-01-16 01:11:39 +01:00
Laurent Destailleur
2c40e4be94
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:45 +01:00
Laurent Destailleur
3bd95c205d
Tooltip to understand the new dictionary of holidays
2020-01-15 14:54:17 +01:00
Laurent Destailleur
141ca20269
Trans
2020-01-15 14:44:53 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
ce2b0b9cad
Trans
2020-01-15 13:51:06 +01:00
Laurent Destailleur
18324962c5
Better help
2020-01-15 13:41:07 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
14d59f43af
Trans
2020-01-15 11:33:02 +01:00
TuxGasy
dcba3d5c7c
New: Professional identifiers for Roumania
2020-01-13 23:00:06 +01:00
Laurent Destailleur
ffd12cd44e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-13 13:44:44 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4
...
NEW Add social networks of the company
2020-01-13 13:38:16 +01:00
Laurent Destailleur
5740d17450
Better help
2020-01-13 12:10:20 +01:00
Laurent Destailleur
a6bae97826
Sync from transifex
2020-01-12 21:28:09 +01:00
Laurent Destailleur
e03bff87e5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-10 19:51:26 +01:00
Laurent Destailleur
89ab80e598
Fix typo
2020-01-10 14:41:58 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
675ce3b32f
Fix sql error on update of subledger account on a various payment
...
Fix warning message that was not accurate
2020-01-10 02:20:08 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
f9262b0dcf
Transifex sync
2020-01-09 22:30:00 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
Laurent Destailleur
8b696970a7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 17:17:28 +01:00
Laurent Destailleur
cef38016bb
Trans
2020-01-09 17:16:30 +01:00
Laurent Destailleur
cee4fe79a3
Update doc
2020-01-09 12:50:04 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5
Debug MRP
2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
Laurent Destailleur
e3c56cea5f
Fix missing lang
2020-01-07 14:19:41 +01:00
Laurent Destailleur
57bbac2015
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 14:09:46 +01:00
Laurent Destailleur
804f7f3e1e
Fix modulebuilder templates
2020-01-06 14:03:24 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Laurent Destailleur
15ad41ee6d
MRP
2020-01-03 15:01:14 +01:00
Alexandre SPANGARO
93d87d581b
FIX typo on language key
2020-01-03 14:56:49 +01:00
Laurent Destailleur
68d7195964
MRP
2020-01-02 22:09:08 +01:00
Laurent Destailleur
84d0ae7ac5
Trans
2020-01-01 17:31:48 +01:00
Laurent Destailleur
90a78267c5
Trans
2020-01-01 17:31:29 +01:00
Laurent Destailleur
eae0800021
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 11:24:10 +01:00
Manu Bryk
14d69c5a2c
New Ref more visible when create a ticket
...
When customers call support to trace a ticket, they don't have easily ref of the ticket. Add Ref to the subject of mail for customers and for TICKET_NOTIFICATION_EMAIL_TO. Add ref also to the notification message when customers create a new ticket.
2019-12-31 17:24:37 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Laurent Destailleur
fc49825eaa
Merge pull request #12659 from andreubisquerra/master
...
NEW: Takepos supplements
2019-12-30 22:07:19 +01:00
Alexandre SPANGARO
9879a43cf4
NEW Add social networks of the company
2019-12-30 21:17:41 +01:00
Alexandre SPANGARO
a804208b32
Fix missing language key
2019-12-27 20:54:47 +01:00
Alexandre SPANGARO
9a7307eea8
FIX Missing language key for MAIN_MAXTABS_IN_CARD
2019-12-26 12:01:09 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
Laurent Destailleur
2df9df2db0
Debug v11
2019-12-23 12:24:27 +01:00
Laurent Destailleur
4312a4b016
Typo
2019-12-22 16:06:32 +01:00
Laurent Destailleur
22b7b69c47
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-22 16:01:32 +01:00
Laurent Destailleur
a739a4dcc3
Fix zh_TW
2019-12-22 13:47:47 +01:00
Laurent Destailleur
05a7e62bf4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-22 12:56:25 +01:00
Laurent Destailleur
f9c3b25dbd
Sync transifex
2019-12-22 12:55:38 +01:00
Laurent Destailleur
e2451bcd26
Update images
...
Fix value of delay for warning on project not closed
2019-12-21 17:11:21 +01:00
Laurent Destailleur
ad039ff968
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
c0ef3b46ad
Work on MRP module
2019-12-20 15:31:05 +01:00
Laurent Destailleur
2ad483413e
Better place to force the default warehouse
2019-12-19 12:05:34 +01:00
Laurent Destailleur
d9a1e1b348
Fix several non dolibarr behaviour on input of salary payments
2019-12-19 10:01:11 +01:00
Laurent Destailleur
92facbc892
Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad
...
FIX : units traductions for selectUnits() function
2019-12-18 12:21:33 +01:00
Alexandre SPANGARO
3fb72c349f
Fix language traduction on import/export tools
2019-12-18 03:25:19 +01:00
Laurent Destailleur
7b1bf32cd9
Update products.lang
2019-12-17 12:19:32 +01:00
gauthier
a672673319
FIX : units traductions for selectUnits() function
2019-12-17 11:25:25 +01:00
Laurent Destailleur
5c8733a84b
More complete message
2019-12-16 19:30:18 +01:00
Laurent Destailleur
65abe7532c
Fix error message not reported when deleting record in ledger.
2019-12-16 19:05:32 +01:00
Laurent Destailleur
98cc2c2886
Add tooltip
2019-12-16 14:29:47 +01:00
Laurent Destailleur
fdf4d86d81
Debug code
2019-12-16 12:38:51 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop
...
Fix: calculation of virtual stock
2019-12-14 13:40:02 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
VESSILLER
0396b348f7
NEW add weighted amount on project/opportunity
2019-12-10 09:32:37 +01:00
Laurent Destailleur
ae6d536d1d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
2b5866aca2
WIP Complete module MRP
2019-12-08 23:45:06 +01:00
andreubisquerra
acbd8efa7d
NEW: Takepos supplements
2019-12-08 23:16:49 +01:00
Rüdiger Hahn
d41675b028
Fix translations
2019-12-08 18:15:13 +01:00
Laurent Destailleur
93d66d8213
Debug v11
2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Laurent Destailleur
cdb0453661
Help
2019-12-05 14:17:40 +01:00
Laurent Destailleur
e6b4d2f665
Debug sumup
2019-12-04 18:06:05 +01:00
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
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +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
8b8aaafc05
Merge branch 'develop' into 10.0_intracommreport
2019-07-20 05:47:31 +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
Alexandre SPANGARO
8f0f8f74f7
WIP
2019-06-26 17:13:38 +02:00
Alexandre SPANGARO
9da91c06ed
Merge branch 'develop' into 10.0_intracommreport
2019-06-26 15:11:43 +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
Alexandre SPANGARO
14a99041a3
WIP
2019-06-25 15:31:18 +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
Alexandre SPANGARO
4a84dcaa62
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-06-23 21:47:34 +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
Alexandre SPANGARO
20b516885f
WIP
2019-06-20 09:33:01 +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
Alexandre SPANGARO
abfb708044
Merge branch 'develop' into 10.0_intracommreport
2019-06-19 21:43:40 +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
Alexandre SPANGARO
a239e0e81f
WIP Admin
2019-05-20 13:33:54 +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
Alexandre SPANGARO
f9e3a958c4
NEW Module Intracomm report
2019-05-19 10:44:09 +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
Marc de Lima Lucio
d428f79d46
NEW: new line template: hidden conf to fill service dates from the last service line
2019-05-15 12:26:39 +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
Laurent Destailleur
c0b12ee94a
Typo
2019-04-22 12:24:21 +02:00
Alexandre SPANGARO
3729e32368
Assets - Debug - Look & field v10
2019-04-18 14:13:48 +02:00
Alexandre SPANGARO
660a1cea1d
NEW Accounting - Add rights on export, delete operations in ledger
2019-04-17 07:26:39 +02:00
Laurent Destailleur
8d18915746
Work on edit link of expense report line and files
2019-04-12 18:18:04 +02:00
Laurent Destailleur
b2da5cedbc
Translation
2019-04-11 21:09:07 +02:00
Laurent Destailleur
a3782f7060
Transifex sync
2019-04-11 16:08:50 +02:00
Laurent Destailleur
203cbd56c2
Finished debug of emailcollector module
2019-04-10 17:35:33 +02:00
Laurent Destailleur
4f2a3d6bdd
Debug ticket module
2019-04-10 16:23:16 +02:00
Laurent Destailleur
2eeb4b8734
Debug ticket module
2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98
Debug module ticket
2019-04-10 15:11:38 +02:00
Laurent Destailleur
1f6f6f6edb
Track action close for ticket
2019-04-10 13:21:06 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425
Work on email collector
2019-04-09 13:23:30 +02:00
Laurent Destailleur
c0b3ee23e5
Fix phpcs
2019-04-08 23:50:18 +02:00
Laurent Destailleur
65e931cfe2
Work on email collector
2019-04-08 21:22:10 +02:00
Laurent Destailleur
36aa53e88d
Missing trans
2019-04-08 19:40:52 +02:00
Laurent Destailleur
1b415a6aed
Fix translation of help tooltip on fields for modulebuilder.
2019-04-08 14:42:46 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1
...
NEW improve Expensereport, Inverse Receiver
2019-04-08 14:04:08 +02:00
Laurent Destailleur
a7ced8ab5d
Merge pull request #10963 from aspangaro/v10_p3
...
NEW: Accounting - Invert module name
2019-04-08 13:39:51 +02:00
Laurent Destailleur
8accc894b0
Update admin.lang
2019-04-08 13:36:11 +02:00
Laurent Destailleur
22ca858b36
Enhance setup of email collector
2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Laurent Destailleur
56194091a9
trans
2019-04-06 13:27:38 +02:00
Laurent Destailleur
0fd1f9abf6
Show if there is no uploaded files
2019-04-05 19:39:30 +02:00
Christophe Battarel
d0fcece613
dont make generic translations
2019-04-05 11:34:23 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Alexandre SPANGARO
4335ea9064
NEW: Accounting - Invert module name
2019-04-04 17:13:20 +02:00
Laurent Destailleur
56f8c42b0a
The PHP extension php-intl is not mandatory but should be installed to
...
have new features working correctly.
2019-04-03 19:37:54 +02:00
Laurent Destailleur
eb6bd20132
Fix error message
2019-04-03 16:16:51 +02:00
Laurent Destailleur
853a0ab7a3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 14:38:42 +02:00
Laurent Destailleur
7120078b0f
NEW Simplification of styles architcture: Showing or not the menuhider
...
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
ebd3a04f7f
Fix translation
2019-04-02 19:48:58 +02:00
Laurent Destailleur
42fda54edf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
9b77cc4db8
Translation of currency
2019-04-02 19:33:14 +02:00
Laurent Destailleur
37b8796f3c
NEW Add line total on list of payments
2019-04-02 17:54:34 +02:00
Laurent Destailleur
84f895bbaf
Merge pull request #10941 from inoveaconseil/modulebuilder2
...
NEW advanced parameters for initiate a new module
2019-03-31 19:02:13 +02:00
Laurent Destailleur
67c207db12
NEW Better explanation for setup of WebDav module
2019-03-30 11:58:49 +01:00
Laurent Destailleur
26e3f41f73
Translation
2019-03-29 16:18:47 +01:00
Laurent Destailleur
ecc7afa4e3
Removed duplicate code
2019-03-29 15:27:00 +01:00
Laurent Destailleur
f1db09fc4f
Shwo field time billed and not billed on list of tasks
2019-03-29 13:18:12 +01:00
Nicolas ZABOURI
1e9287c9d8
0.1
2019-03-28 23:57:17 +01:00
Laurent Destailleur
80f7cef0a8
Better translation
2019-03-28 09:20:05 +01:00
Laurent Destailleur
8998e4c6a3
Fix add of a table in floor for Bar and Restaurant
2019-03-27 18:40:02 +01:00
Laurent Destailleur
6e643e90cf
Translation
2019-03-27 18:00:44 +01:00
Laurent Destailleur
7b8443c350
Fix trans
2019-03-26 20:34:09 +01:00
Laurent Destailleur
4b378a8d4b
Merge branch 'develop' into PaiementsModes
2019-03-26 19:45:39 +01:00
Laurent Destailleur
24af5cfab5
Merge pull request #10912 from Tetras-Libre/VATGrouped
...
TakePOS tickets : Grouped VAT
2019-03-26 19:22:40 +01:00
Laurent Destailleur
f991d4ba99
Fix typo
2019-03-26 18:10:28 +01:00
Laurent Destailleur
aad3867b9b
Fix translation
2019-03-26 14:00:01 +01:00
Laurent Destailleur
9eaef2ce7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
1787b31932
FIX setup of module export
2019-03-26 12:18:28 +01:00
Laurent Destailleur
0f2dd5dc34
Add label for tax
2019-03-24 23:36:40 +01:00
Laurent Destailleur
c148157566
Remove duplicate translation keys
2019-03-24 23:29:22 +01:00
David Beniamine
f4e23ea427
Merge branch 'develop' into PaiementsModes
2019-03-24 21:34:33 +01:00
David Beniamine
b554ca2b73
Merge branch 'develop' into VATGrouped
2019-03-24 21:06:29 +01:00
David Beniamine
833da30af1
Use any dolibarr enabled paiement mode
2019-03-24 21:01:42 +01:00
David Beniamine
4b61f0d606
Grouped VAT
...
Add an option to group VAT by rate in receipt
2019-03-24 20:17:41 +01:00
markus
f942917f53
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-24 17:42:49 +01:00
Laurent Destailleur
7d54c7a480
Fix translation
2019-03-22 14:38:06 +01:00
Laurent Destailleur
cd6a0bacdd
Look and feel v10
2019-03-22 14:32:15 +01:00
Laurent Destailleur
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +01:00
Laurent Destailleur
438b20df42
Merge pull request #10903 from Tetras-Libre/AutoPrintTicketsOption
...
Automatically print receipt
2019-03-22 12:28:49 +01:00
Laurent Destailleur
c43cf843a9
Merge branch 'theme_top_menu_login' of https://github.com/atm-john/dolibarr into atm-john-theme_top_menu_login
2019-03-22 11:15:02 +01:00
David Beniamine
10ab6f480d
Automatically print receipt
2019-03-22 09:28:58 +01:00
Christophe Battarel
61f9aac887
begin factorization of categories cloning
2019-03-18 14:16:41 +01:00
Christophe Battarel
7bc0260661
begin factorization of categories cloning
2019-03-18 14:15:55 +01:00
Laurent Destailleur
bb8845ac41
Merge pull request #10865 from atm-maxime/new_box_birthdays
...
NEW Widget birthdays of the month
2019-03-18 08:56:58 +01:00
Laurent Destailleur
b3dc6d7d1d
NEW Generation of doc by modulebuilder can include README and CHANGELOG
2019-03-17 19:33:25 +01:00
Maxime Kohlhaas
e090cd6f87
New box birthdays of the month
2019-03-17 16:55:26 +01:00
Laurent Destailleur
39b9ca2397
Work on documentation generation by modulebuilder
2019-03-17 15:45:50 +01:00
Laurent Destailleur
7f007f4182
Prepare modulebuilder to work on core modules
2019-03-17 02:46:28 +01:00
Laurent Destailleur
6a41819d0f
Enhance the perf page.
2019-03-17 00:55:18 +01:00
Laurent Destailleur
a6add0d8a9
Debug module debugbar
2019-03-17 00:48:12 +01:00
Laurent Destailleur
1abfd1f58e
Add page to setup module debugbar
...
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
c2badb57d7
NEW: Add module debugbar
2019-03-16 16:27:14 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
ca31f654e7
Reduce text for graph title
2019-03-14 23:42:22 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
5ccfba1210
FIX Edit of personalized groups
...
Conflicts:
htdocs/accountancy/admin/categories.php
2019-03-14 16:06:20 +01:00
Laurent Destailleur
3ab5c3e6ab
FIX Edit of personalized groups
2019-03-14 16:03:37 +01:00
Laurent Destailleur
7f23a396a9
Merge pull request #10794 from aspangaro/10.0_AccountancyMenuV2
...
NEW: Accounting - More comprehensive menu
2019-03-14 14:29:01 +01:00
Laurent Destailleur
39e6e71b0d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
7b8b6bb02f
Merge pull request #10804 from hregis/9.0_merge
...
FIX possibility to set up payment mode when invoice module is disabled
2019-03-14 14:09:00 +01:00
Laurent Destailleur
7e31e6b4f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
e0208cb3d6
Generation of PDF doc
2019-03-13 18:11:15 +01:00
Laurent Destailleur
0e1479ef4e
Lang
2019-03-13 11:04:14 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Laurent Destailleur
c2063c5d0b
Fix bad translation
2019-03-12 18:24:55 +01:00
Laurent Destailleur
fe6b682ec0
NEW Add visibility with value 4 in framework to define fields to show on
...
forms and list but not on creation forms.
2019-03-12 17:45:19 +01:00
John BOTELLA
d62db95803
Add trad and icon
2019-03-12 14:22:20 +01:00
Regis Houssin
47057b431d
FIX translation
2019-03-12 07:56:22 +01:00
markus
63a3e3df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-11 12:38:49 +01:00
Christophe Battarel
3215e066e4
copy linked categories when cloning a product
2019-03-11 10:00:44 +01:00
Laurent Destailleur
935fe7c22a
Debug and enhance modulebuilder.
2019-03-10 19:33:28 +01:00
markus
d7ca08afb0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-10 15:26:35 +01:00
Laurent Destailleur
d659543ac0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-09 19:00:57 +01:00
Laurent Destailleur
441b577599
Add missing trans
2019-03-09 12:58:52 +01:00
Laurent Destailleur
b710e28ffa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
markus
1e4ed531b4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-03-08 11:47:08 +01:00
Laurent Destailleur
1a96a7a88f
FIX More complete auto setup of barcode module
...
Add tooltip help on member setup module
2019-03-08 11:31:12 +01:00
Alexandre SPANGARO
5d06e53f1b
NEW: Accounting - More comprehensive menu
2019-03-08 09:11:56 +01:00
Laurent Destailleur
0798f7b719
NEW Can upload files from the edit page of expense report
2019-03-07 20:53:03 +01:00
Laurent Destailleur
f54eb78260
NEW Show the latest date of subscription in member statistics reports
2019-03-07 12:22:24 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e163849d05
Fix label
2019-03-06 19:13:59 +01:00
Laurent Destailleur
16e90ffae4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/langs/en_US/website.lang
2019-03-05 15:59:42 +01:00
Laurent Destailleur
f402966eb8
Missing translation
2019-03-05 15:48:12 +01:00
Laurent Destailleur
b851911708
Dolibarize module ticket
2019-03-05 12:18:46 +01:00
Laurent Destailleur
4a582485b9
Debug module ticket
2019-03-04 19:19:09 +01:00
markus
c905575d3e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-03-04 17:26:40 +01:00
Laurent Destailleur
cff6cd9662
Merge pull request #10731 from andreubisquerra/master
...
Add Order Notes to TakePOS
2019-03-04 16:02:26 +01:00
Laurent Destailleur
7b7ff33fdf
Work on BOM module
2019-03-04 13:30:43 +01:00
Laurent Destailleur
a46b7f5202
Work of BOM module
2019-03-04 12:49:22 +01:00
andreubisquerra
b1e9a0fe38
Add Order Notes to TakePOS
2019-03-03 12:50:36 +01:00
Laurent Destailleur
c4e96e9f74
Fix language
2019-02-27 13:48:13 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Laurent Destailleur
b33b3698c8
Merge pull request #10691 from aspangaro/develop
...
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
2019-02-27 02:18:20 +01:00
Laurent Destailleur
a6e9da192c
Update accountancy.lang
2019-02-27 02:18:00 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2
2019-02-27 01:51:01 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
markus
d38bff6f14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-26 12:31:24 +01:00
Alexandre SPANGARO
1c59554806
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
2019-02-25 22:22:31 +01:00
Laurent Destailleur
fc1d0b2dd5
Add missing translation
2019-02-25 19:07:29 +01:00
Laurent Destailleur
25d277aceb
More complete translation
2019-02-25 19:02:41 +01:00
Laurent Destailleur
5ffc1822d9
Translation
2019-02-25 19:01:51 +01:00
Laurent Destailleur
b4e3bb37af
Sync transifex
2019-02-23 15:11:41 +01:00
Laurent Destailleur
9aa8de3367
FIX #10644
2019-02-23 15:10:18 +01:00
Laurent Destailleur
4eac819df0
Trans
2019-02-20 05:22:05 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
ptibogxiv
c3346fead9
fix lang
2019-02-19 12:57:08 +01:00
ptibogxiv
091d2b9d68
FIX lang
2019-02-19 12:55:48 +01:00
Alexandre SPANGARO
f5b5859089
Language
2019-02-18 07:16:00 +01:00
Alexandre SPANGARO
49a975beb3
Update works
2019-02-18 07:14:21 +01:00
Alexandre SPANGARO
93a0cdd6d6
NEW: Add accounting account for result
...
Use for closure workflow
2019-02-18 06:00:21 +01:00
markus
aa5dfb3cf9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-16 14:43:35 +01:00
andreubisquerra
8cc2662f01
Update TakePOS in Dolibarr 9
2019-02-14 20:59:32 +01:00
markus
db6cce479e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-13 13:26:56 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
04950a5c91
Trans
2019-02-12 16:29:37 +01:00
markus
34026d1005
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-12 13:53:17 +01:00
markus
33b34f57a8
Fix de/main.lang
2019-02-12 13:53:11 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
f0e56abac7
NEW Module ticket is available as a stable module
2019-02-11 19:16:37 +01:00
Laurent Destailleur
9353cf976d
Fix translation
2019-02-11 18:44:43 +01:00
Frédéric FRANCE
b041eeae22
first parameter of print_liste_field_titre was translated
2019-02-10 18:11:34 +01:00
Frédéric FRANCE
ba32c3b782
first parameter of print_liste_field_titre was translated
2019-02-10 16:06:07 +01:00
Frédéric FRANCE
af3adcecb0
first parameter of print_liste_field_titre was translated
2019-02-10 15:48:53 +01:00
Laurent Destailleur
7d20321b3b
Fix trans
2019-02-09 19:24:52 +01:00
Laurent Destailleur
0839b39c52
Fix translation
2019-02-09 19:15:36 +01:00
Laurent Destailleur
d38ead798a
Trans
2019-02-09 19:12:24 +01:00
Laurent Destailleur
c77d328f12
Fix translation
2019-02-09 19:05:15 +01:00
Laurent Destailleur
7f4bbcf9a5
Some minor fix in default values and modulebuilder
2019-02-09 13:40:22 +01:00
florian HENRY
3f20cae6d3
NEW: setup default thridparty type (customer or prospect/customer)
2019-02-06 10:54:11 +01:00
Laurent Destailleur
9e28db4202
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
2019-02-06 00:51:10 +01:00
Laurent Destailleur
7c24847fa3
Typo
2019-02-05 19:38:28 +01:00
Laurent Destailleur
7436a3bc73
Typo
2019-02-05 19:37:58 +01:00
Laurent Destailleur
66998c4873
Fix translation
2019-02-05 19:37:22 +01:00
Laurent Destailleur
0345c00f0a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 16:45:10 +01:00
Laurent Destailleur
bb315a6f12
Fix trans
2019-02-05 16:44:10 +01:00
Laurent Destailleur
d49dd8d593
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 15:16:44 +01:00
Laurent Destailleur
541f6e537e
Fix link to pay membership renewal
2019-02-05 14:05:39 +01:00
Laurent Destailleur
b58c49d0bb
Trans
2019-02-05 13:59:23 +01:00
Laurent Destailleur
d6501d996c
Missing trans
2019-02-05 13:56:55 +01:00
Laurent Destailleur
48ab519841
Fix typo
2019-02-03 21:40:56 +01:00
Laurent Destailleur
5a6e46a9c3
Doc
2019-02-03 21:40:23 +01:00
andreubisquerra
8b1b8bb7a3
CSS improvements and Takepos setup check
2019-02-02 23:57:38 +01:00
Laurent Destailleur
28c1b1ce58
Work on billing time spent
2019-02-01 22:39:36 +01:00
Laurent Destailleur
9d03f4b228
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-01 18:17:02 +01:00
Laurent Destailleur
b83ff06db8
FIX #10416 No need of another option
2019-02-01 17:00:04 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
b14a16a119
Code comment
2019-02-01 13:48:09 +01:00
Laurent Destailleur
c05628c746
Fix edit member module setup
2019-01-31 20:27:55 +01:00
Laurent Destailleur
0a56069f67
Fix trans
2019-01-31 19:42:55 +01:00
Laurent Destailleur
4c31749f4b
Add tooltip on setup
2019-01-31 11:11:56 +01:00
Laurent Destailleur
d0b20178e0
Merge pull request #10442 from aspangaro/10.0_accountancy_default
...
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-30 16:30:13 +01:00
Laurent Destailleur
7983a85bb2
Update accountancy.lang
2019-01-30 16:29:45 +01:00
Laurent Destailleur
60fa8d08c2
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
...
FIX: FEC Compatibility for import in ledger
2019-01-30 15:01:02 +01:00
Alexandre SPANGARO
1b675ba0b6
FIX: FEC Compatibility for import in ledger
2019-01-30 09:51:29 +01:00
Alexandre SPANGARO
64975b3b9e
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-28 22:27:55 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Laurent Destailleur
5cd60f4e26
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-28 16:27:54 +01:00
Laurent Destailleur
9dbf41d6b2
Fix lang format
2019-01-28 16:25:06 +01:00
Laurent Destailleur
4545c0f13a
Fix lang format of en_ZA
2019-01-28 16:25:01 +01:00
Laurent Destailleur
820db4e78b
Fix lang format
2019-01-28 16:22:53 +01:00
Laurent Destailleur
2dea4f01f5
Fix lang format of en_ZA
2019-01-28 16:22:36 +01:00
andreubisquerra
bec25fb45c
Remove absolut divs and add Dolistore POS category link to TakePOS
2019-01-27 01:28:32 +01:00
Laurent Destailleur
f313791e57
Merge pull request #10400 from andreubisquerra/master
...
Bills and coins pad, or Num pad in TakePOS
2019-01-26 13:55:45 +01:00
Laurent Destailleur
cfa850cd20
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-26 01:32:00 +01:00
Laurent Destailleur
2c8557e2e0
Work on invoicing of time spent
2019-01-24 18:16:14 +01:00
Laurent Destailleur
c95b915db3
Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0
2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914
Trans
2019-01-24 07:07:26 +01:00
andreubisquerra
5b3559418f
Bills and coins pad, or Num pad in TakePOS
2019-01-23 20:59:34 +01:00
Laurent Destailleur
f9686c47af
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
ad54a2b8af
Fix website edit of virtualhost
2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2
FIX Edit of virtualhost
2019-01-23 14:57:43 +01:00
Laurent Destailleur
bb1e7ee0a1
Fix transifex
2019-01-22 19:54:47 +01:00
Laurent Destailleur
c5686df035
Sync transifex
2019-01-22 18:16:08 +01:00
Laurent Destailleur
eefa57bf6b
Sync transifex
2019-01-22 18:15:47 +01:00
Laurent Destailleur
ccbec3d29f
Fix typo
2019-01-22 16:27:23 +01:00
Laurent Destailleur
51bdf5f949
Fix trans
2019-01-22 16:06:20 +01:00
Laurent Destailleur
5c2b9e3078
NEW Introduce PhpSpreadsheet for export (need php5.6+)
2019-01-21 14:06:01 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
4cf624e448
Merge pull request #10366 from ptibogxiv/patch-90
...
Fix: members.lang
2019-01-19 11:20:52 +01:00
Philippe GRAND
59cfa02bdb
missing translation
2019-01-18 16:21:06 +01:00
markus
de9b8f427d
Add configurable days to SEPA Withdrawal Execution Date
2019-01-18 16:16:55 +01:00
Laurent Destailleur
971670da8d
Clean language file
2019-01-18 14:24:49 +01:00
ptibogxiv
796b19bc1b
Update members.lang
2019-01-17 22:40:34 +01:00
Laurent Destailleur
ab5aaa6b43
Start debug compta-files
2019-01-17 00:32:43 +01:00
Laurent Destailleur
c357cb8c4e
Clean code
2019-01-16 12:42:54 +01:00
Laurent Destailleur
d6b0f852c5
Work on invoicing time spent
2019-01-15 21:01:01 +01:00
Laurent Destailleur
48e7fcd821
Remove not used keys
2019-01-13 16:55:46 +01:00
Laurent Destailleur
ab3365440c
Fix translation
2019-01-13 16:51:34 +01:00
Laurent Destailleur
653acf556b
Fix translation Customer order into Sales order
2019-01-10 12:15:42 +01:00
Laurent Destailleur
22d4afbb62
Missing trans
2019-01-10 01:54:06 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1188540b41
Sync transifex
2019-01-07 19:39:41 +01:00
Laurent Destailleur
527ef8bdc8
Add nb of invoice to help cash fence
2019-01-07 19:02:38 +01:00
Laurent Destailleur
1403ac3cc1
Trans
2019-01-07 18:07:56 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
cf84fdf7c7
Translate option "Simplify interface for blind persons"
2019-01-03 20:07:58 +01:00
ldestailleur
1b19f5153b
Fix cash fence feature
2019-01-03 14:18:02 +01:00
ldestailleur
dbbfdd984a
Fix emailcollector can't be used without syntax rules
2019-01-03 11:47:27 +01:00
Laurent Destailleur
08b1e67e5c
Merge pull request #10275 from aspangaro/10.0_accountancy_member
...
NEW: Accountancy - Add default accounting account for member subcription
2019-01-02 19:51:30 +01:00
andreubisquerra
8dee9de8f5
Add header and footer to TakePOS receipt
2018-12-30 22:20:55 +01:00
Alexandre SPANGARO
a2075b9d2c
V9 look & Feel, etc
2018-12-30 20:32:44 +01:00
Alexandre SPANGARO
41c7af590d
NEW: Accountancy - Add default accounting account for member subcriptions
2018-12-29 22:11:24 +01:00
Laurent Destailleur
afac151793
Merge pull request #10261 from torvista/import
...
Changes for csv import of Third Parties and Products
2018-12-22 18:40:37 +01:00
Laurent Destailleur
20f6f8887a
Fix typo
2018-12-22 18:40:00 +01:00
Laurent Destailleur
4ae88642ec
Fix typo
2018-12-22 18:35:51 +01:00
Laurent Destailleur
a997001dbf
Fix typo
2018-12-22 18:34:48 +01:00
Laurent Destailleur
78460d2f60
Merge pull request #10257 from torvista/langs-en_US
...
langs-en_US
2018-12-22 18:33:37 +01:00
Laurent Destailleur
3d509910dd
Merge branch 'develop' into master
2018-12-22 18:24:23 +01:00
Laurent Destailleur
afee39ea68
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-21 12:09:27 +01:00
Laurent Destailleur
4859d944d8
Sync transifex
2018-12-21 12:09:03 +01:00
Laurent Destailleur
391f916bd5
Fix trans
2018-12-21 10:21:56 +01:00
Laurent Destailleur
ae6596cac7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-21 09:57:29 +01:00
torvista
2ff35895b6
minor improvements
...
new constants for missing direct debit terms
2018-12-20 23:36:35 +01:00
Steve
70c0adc3d1
import.php
...
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
2018-12-20 16:49:17 +01:00
torvista
54436f72c7
minor improvements
2018-12-20 13:38:49 +01:00
andreubisquerra
c4be1b141d
Temporary ticket improvement in TakePOS
2018-12-19 22:52:16 +01:00
torvista
9f9a468f6a
more fine tuning
2018-12-19 16:22:27 +01:00
Laurent Destailleur
b0652494b5
Debug cash fence
2018-12-19 15:40:01 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
c3eb131054
Debug ticket module
2018-12-18 13:30:22 +01:00
Laurent Destailleur
48162db33d
FIX Rename of image file lose the thumbs
2018-12-17 20:19:11 +01:00
Laurent Destailleur
623afd1020
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f
Debug website module
2018-12-17 17:29:04 +01:00
Laurent Destailleur
e014fdc20b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 11:43:02 +01:00
Laurent Destailleur
e06b06c788
Work on cash fence
2018-12-17 10:37:56 +01:00
Laurent Destailleur
cbb5e3bbe9
Better translation
2018-12-17 03:31:20 +01:00
Laurent Destailleur
af4405c669
FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE
2018-12-16 20:29:08 +01:00
Laurent Destailleur
9ce07b9582
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Juanjo Menent
6ce0d3e279
FIX: Vendor translations are in english
2018-12-16 11:16:12 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985
Work on cash fence
2018-12-15 19:58:43 +01:00
Laurent Destailleur
0451eb741b
Work on legal cash fence
2018-12-15 19:20:30 +01:00
Laurent Destailleur
54ffba793f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
htdocs/langs/en_US/admin.lang
2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894
Typo
2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8
FIX Mandatory field feature should works on textarea
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52
FIX Mandatory field feature should works on textarea
2018-12-15 18:11:40 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
699dc239d4
Fix US trans
2018-12-15 12:24:14 +01:00
Laurent Destailleur
69c666162f
Update projects.lang
2018-12-15 12:13:54 +01:00
Laurent Destailleur
2fafef6b7d
Merge branch 'develop' into lang-en_US
2018-12-15 12:11:22 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop
...
Add a link for compta-files.php in the accountancy leftmenue
2018-12-15 12:09:42 +01:00
torvista
6f5f4bd3de
added latest Develop edits
2018-12-14 20:33:07 +01:00
torvista
805c184163
more supplier->vendor found!
...
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
2018-12-14 20:17:22 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card
2018-12-14 15:26:15 +01:00
Laurent Destailleur
9e83699193
Merge branch 'develop' into new_branch_31_10_2018
2018-12-14 14:27:35 +01:00
Laurent Destailleur
55487da03e
Merge branch 'develop' into langs_en_US
2018-12-14 11:09:25 +01:00
torvista
1c7189ed40
supplier->vendor
...
suppliers->vendors
2018-12-13 22:24:45 +01:00
Juanjo Menent
22c34bd656
Fix: MenuBankCash Translation is in english in es_ES
2018-12-12 12:09:07 +01:00
torvista
2abb2f054d
Fix conflict
2018-12-11 23:12:08 +01:00
torvista
1226868bd9
missed one
2018-12-11 10:36:36 +01:00
torvista
351274d85d
1) Standardization of use of "third party"
...
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
2018-12-11 10:08:19 +01:00
Laurent Destailleur
434cf2e046
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-11 09:58:14 +01:00
Laurent Destailleur
e2a575e547
Fix use of external url in iframes
2018-12-10 18:44:45 +01:00
Laurent Destailleur
6105bb2bb6
Fix: difference between text and url into external web site module
2018-12-10 18:10:57 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
Laurent Destailleur
f3a67d6c3f
FIX Show warning when trying to create task on closed project
2018-12-10 15:06:54 +01:00
Laurent Destailleur
dbee87aa9d
Trans
2018-12-10 13:10:28 +01:00
Laurent Destailleur
cd3716ff9f
Dolibarize module ticket
2018-12-08 16:37:41 +01:00
Laurent Destailleur
2621af96d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
2018-12-07 19:08:53 +01:00
Laurent Destailleur
a9a191819f
Work on billing time spent
2018-12-06 21:25:28 +01:00
Laurent Destailleur
163cac5349
Trans lead
2018-12-06 20:25:22 +01:00
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +01:00
Alexandre SPANGARO
0c6f6b80cb
Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats
2018-12-03 21:16:53 +01:00
Laurent Destailleur
7c46ace042
Merge pull request #10153 from atm-maxime/fix_user_photo
...
Fix user photo path
2018-12-02 17:07:14 +01:00
Juanjo Menent
aa2ecd4b73
Merge pull request #10162 from aljawaid/aljawaid-ecm_translations
...
FIX: Add Missing Translation Strings into ecm.lang
2018-12-02 15:51:40 +01:00
IJ
30f1925177
FIX: Add Missing Translation Strings into ecm.lang
...
- ECMDocsByHolidays
- ECMDocsBySupplierProposals
2018-12-02 12:29:52 +00:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Maxime Kohlhaas
72225f6524
Migration of user photo paths
2018-12-01 23:57:15 +01:00
andreubisquerra
1009588592
TakeBOX now is 'TakePOS Connector'
2018-12-01 17:09:21 +01:00
Inovea Conseil
6201962dcf
Fix missing translation
2018-11-30 23:27:05 +01:00
Laurent Destailleur
94c2d7194c
Trans Website
2018-11-30 12:41:35 +01:00
Laurent Destailleur
10fc0149d8
responsive
2018-11-29 11:03:02 +01:00
Laurent Destailleur
3c0ff40e43
Fix trans
2018-11-29 00:41:12 +01:00
Laurent Destailleur
ca1f9c7e60
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/sendings.lang
htdocs/langs/es_ES/stocks.lang
2018-11-28 16:57:39 +01:00
Juanjo Menent
2f61d29b06
FIX : #10080 Supplier translations are in english
2018-11-28 10:40:45 +01:00
Laurent Destailleur
0b6aaccfcc
sync transifex
2018-11-27 16:35:47 +01:00
Laurent Destailleur
e95c6091c4
Fix lang
2018-11-27 11:10:39 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Laurent Destailleur
71bcabd8eb
Missing trans
2018-11-27 10:23:58 +01:00
Laurent Destailleur
7c22504252
Fix position of field must be ssame between create/edit/view
2018-11-27 09:22:59 +01:00
Laurent Destailleur
611569f639
Add missing translation
2018-11-26 11:18:01 +01:00
Laurent Destailleur
1d2c2a23ef
Fix look and feel v8
2018-11-25 11:57:19 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Laurent Destailleur
ea7c77d788
Trans
2018-11-23 11:09:27 +01:00
Laurent Destailleur
a06b032c23
fix trans
2018-11-23 10:53:04 +01:00
Laurent Destailleur
97af22369d
Trans
2018-11-22 13:47:55 +01:00
Laurent Destailleur
3bb7726101
Revert "Fix translation"
...
This reverts commit 8de30c12d8
2018-11-22 13:22:05 +01:00
Laurent Destailleur
8de30c12d8
Fix translation
2018-11-22 13:19:25 +01:00
Laurent Destailleur
6514b51382
Better help
2018-11-20 21:59:05 +01:00
Laurent Destailleur
200de22807
Missing image in container
2018-11-20 16:48:34 +01:00
Laurent Destailleur
4b82538941
Better module position
2018-11-20 14:56:14 +01:00
Laurent Destailleur
839428d545
Missing trans
2018-11-19 19:02:00 +01:00
Laurent Destailleur
a3398f1a8d
Sync transifex
2018-11-19 15:49:58 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
Laurent Destailleur
a179d45afd
Remove deprecated translation keys
2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23
Trans
2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1
Sync transifex
2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
Laurent Destailleur
f32706259a
Sync transifex
2018-11-16 14:13:00 +01:00
Laurent Destailleur
7d5c9959bc
Close #9978
...
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Laurent Destailleur
0b57faa7b4
Fix help
2018-11-11 14:42:11 +01:00
patrick Delcroix
e9d3db084a
new: link to the compta-files.php in the accountancy left menu
2018-11-10 15:35:56 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim
...
add admin dkim translation
2018-11-10 12:16:43 +01:00
Laurent Destailleur
e86e3ec7ac
Work on email collector
2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3
Work on emailcollector
2018-11-09 18:18:17 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation
2018-11-09 18:08:06 +01:00
Laurent Destailleur
50bd8bc4ce
Merge pull request #9969 from grandoc/new_branch_07_11_2018
...
fix : missing translation
2018-11-08 19:55:25 +01:00
Laurent Destailleur
193b153fbf
Work on email collector
2018-11-07 18:02:08 +01:00
Laurent Destailleur
6ba78b2bb3
Work on email collector
2018-11-07 16:33:06 +01:00
Philippe GRAND
671b4dc227
fix : missing translation
2018-11-07 14:01:49 +01:00
Laurent Destailleur
c4db549f94
Work on emailcollector
2018-11-06 19:49:52 +01:00
François J
f9a8b240ac
Add PredefinedMailContentContact lang string
2018-11-06 15:05:03 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08
Debug emailcollector
2018-11-05 16:59:40 +01:00
Laurent Destailleur
6b89bc4ecc
Merge pull request #9937 from aspangaro/9.0_FEC
...
Debug asset module
2018-11-05 09:36:42 +01:00
Laurent Destailleur
67fbb3dbb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Alexandre SPANGARO
8d8023b405
Debug asset module
2018-11-01 22:32:33 +01:00
Laurent Destailleur
c9ef298839
Fix setup template emails
2018-10-31 11:38:04 +01:00
Philippe GRAND
fe6b185bf1
Typo
2018-10-31 10:32:40 +01:00
Laurent Destailleur
3d16b05fdb
Fix fetch
2018-10-30 21:30:44 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
af9b8f033a
Click to refresh
2018-10-28 17:23:42 +01:00
Maxime Kohlhaas
46d3bec104
Fix replenish wasn't caring about supplier price min quantity #9561
2018-10-28 10:25:56 +01:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Laurent Destailleur
0ba86d4e5b
Trans
2018-10-26 12:22:31 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
Laurent Destailleur
1ba716b82c
Fix do not allow use of second or third tax without using 1st one.
2018-10-25 14:39:54 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
Laurent Destailleur
24f37c7bd7
CSS
2018-10-24 12:12:06 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
612e3a9805
Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
...
into aspangaro-9.0_accountancy
# Conflicts:
# htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
# htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
# htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
Juanjo Menent
e40ee879dc
New: works with variants:
...
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
2018-10-23 13:07:09 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
atm-quentin
0a033f4cfd
FIX : manage error
2018-10-22 16:49:36 +02:00
root
0c61162698
fix langs workflow reception
2018-10-22 14:56:13 +02:00
Alexandre SPANGARO
5cbcef4465
Debug Lettering
2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
...
Experimental new pdf documents using new column system
2018-10-19 15:51:54 +02:00
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type
...
NEW Add configuration to disable "customer/prospect" thirdparty type
2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang
2018-10-19 13:47:18 +02:00
atm-quentin
cfba5a5e0f
fix when model mail selected
2018-10-18 17:02:20 +02:00
Laurent Destailleur
548fafc6e9
Fix trans
2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a
Fix trans
2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725
Fix translation
2018-10-18 01:05:10 +02:00
atm-greg
d86c44e641
Add conf to disable a thirdparty type
2018-10-17 15:55:46 +02:00
atm-quentin
236a61ab55
new manage correctly create bills on reception
2018-10-17 11:56:32 +02:00
Alexandre SPANGARO
a5ebcff2ee
Fix lettering function
2018-10-16 22:27:34 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
...
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
502c52b78f
Show real path of module if not into custom
2018-10-16 18:09:43 +02:00
Laurent Destailleur
4bdcb17694
Trans
2018-10-16 15:38:26 +02:00
atm-quentin
f11e1940fc
NEW mass action list reception create bills for validated reception
2018-10-16 12:05:28 +02:00
Laurent Destailleur
35f9371343
Fix missing es translation string
2018-10-16 03:30:17 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Juanjo Menent
e3643c7ab7
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-15 11:44:50 +02:00
Laurent Destailleur
0a8f305151
Trans
2018-10-15 02:40:49 +02:00
Laurent Destailleur
b0569de166
Work on multilang support
2018-10-14 18:44:29 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents
...
NEW hidden option to define an invoice template for each invoice type
2018-10-14 16:36:37 +02:00
Maxime Kohlhaas
9be8c579d0
New massaction to generate PDF
2018-10-14 15:50:55 +02:00
Laurent Destailleur
26c9158ed7
Label of DPO
2018-10-14 14:20:28 +02:00
Laurent Destailleur
8a928a72fa
Sync transifex
2018-10-13 14:03:32 +02:00
Laurent Destailleur
31152e10f6
Trans
2018-10-13 13:27:59 +02:00
Laurent Destailleur
ef820e4c55
Merge pull request #9726 from fgarcia78/develop
...
FIX translatable field name in stock movement table
2018-10-12 17:52:52 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
atm-quentin
83e4d6bd13
NEW export reception
2018-10-11 15:28:28 +02:00
atm-quentin
4b23b46e48
NEW workflow set reception billed on validate supplier bill
2018-10-11 14:49:19 +02:00
Fernando Octavio García López
c7eb935cb8
FIX Fixed translatable field name in stock movement table
2018-10-10 22:57:08 -06:00
Laurent Destailleur
6c55bfc0f7
Fix export and remove duplicate csv export.
2018-10-10 19:45:26 +02:00
Laurent Destailleur
619ac9c7cf
Fix help
2018-10-10 18:42:53 +02:00
Laurent Destailleur
cb29209457
NEW Enhancement in process to make manual bank conciliation
2018-10-10 12:47:18 +02:00
atm-quentin
489ccc3c49
NEW list and fix conf
2018-10-10 12:19:57 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
414876e25e
More complete message
2018-10-10 01:46:43 +02:00
Laurent Destailleur
2539f0047f
FIX Sending of reminder for expired subscriptions
2018-10-09 23:10:39 +02:00
Laurent Destailleur
dfe9c05d2f
Merge menu entry for tags/categories as submenu of element.
2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 14:53:39 +02:00
Laurent Destailleur
9bea9edfd7
FIX Menu to show/edit Users categories was missing
2018-10-09 14:41:21 +02:00
Laurent Destailleur
a2a53a32f1
FIX Look and feel v8. Missing button "Create category"
2018-10-09 14:34:25 +02:00
Laurent Destailleur
4d959bbea7
Fix consistency of label of proposal status
2018-10-09 14:06:45 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
...
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Laurent Destailleur
398603c789
Merge pull request #9696 from IAS-SYSTEMS-CSC/develop
...
new malay lang tag
2018-10-09 12:40:26 +02:00
atm-quentin
9f56540e75
NEW actions buttons done with stock movement
2018-10-09 11:33:41 +02:00
Laurent Destailleur
1c74dcc270
NEW Can filter on EEC, not EEC, etc... in binding step of accountancy
2018-10-09 01:47:37 +02:00
Alexandre SPANGARO
75b9862c14
New : Add FEC Export in accountancy
2018-10-08 21:01:21 +02:00
Laurent Destailleur
923b561aff
FIX Option for prof id mandatory not working with custom type of company
2018-10-08 20:01:45 +02:00
Laurent Destailleur
7be9b6d94e
Fix translation of source of proposals
2018-10-08 14:04:22 +02:00
atm-quentin
095d851e79
FIX affichage ligne reception
2018-10-08 12:15:17 +02:00
ias-ceo
de17977bff
new malay lang tag
2018-10-06 15:09:06 +03:00
atm-quentin
6a8092dfae
NEW entete reception card
2018-10-05 16:21:50 +02:00
Laurent Destailleur
f154139a0e
Reduce length of tab title "Bank"
2018-10-04 20:22:25 +02:00
Laurent Destailleur
b52a38bcd2
Trans
2018-10-04 17:59:34 +02:00
Laurent Destailleur
3b7af822db
Merge pull request #9663 from frederic34/patch-18
...
add missing translation key found in box graph
2018-10-04 17:26:42 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
atm-quentin
5fe767d7bd
debut card create
2018-10-04 12:27:10 +02:00
Laurent Destailleur
402175bb49
Work on multilang
2018-10-03 19:53:33 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Laurent Destailleur
8ee98315c7
Lang
2018-10-03 13:13:16 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +02:00
Frédéric FRANCE
a722e98d8d
add missing translation key found in box graph
2018-10-02 21:20:04 +02:00
atm-quentin
baed678b6e
NEW shipping set draft and update line
2018-10-02 15:49:31 +02:00
Laurent Destailleur
771922f427
Use 2 distinct left menu entries for leads and projects
2018-10-01 18:56:47 +02:00
Laurent Destailleur
aaa5efc77e
Clean Take pos module
2018-09-28 22:06:04 +02:00
Laurent Destailleur
f990719daa
Add experimental module TakePOS
2018-09-28 13:31:41 +02:00
Laurent Destailleur
3f3c8aeb26
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-28 02:23:20 +02:00
Laurent Destailleur
c07ab81e6a
Fix trans
2018-09-28 02:22:23 +02:00
Laurent Destailleur
851fd4cc18
NEW Can set the default focus of each page.
...
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830
Work on mandatory form fields
2018-09-27 16:38:18 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
...
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Laurent Destailleur
6680fca6c6
Add missing translation key
2018-09-27 09:13:28 +02:00
Laurent Destailleur
ba3ca550ce
Fix date in text for substitution. Removed not used translation keys.
2018-09-25 11:36:40 +02:00
Laurent Destailleur
bd523973d8
Add missing translation key
2018-09-25 00:55:03 +02:00
Laurent Destailleur
9dc4ad4cc3
Add warning when using editinline
2018-09-24 15:38:13 +02:00
Laurent Destailleur
5c0e6eacf6
Use latest instead of last
2018-09-24 10:43:12 +02:00
Laurent Destailleur
26d585ffbe
Use latest instead of last
2018-09-24 10:43:01 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:14:38 +02:00
Laurent Destailleur
2dbb82fc76
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2
Missing trans
2018-09-24 10:03:08 +02:00
Laurent Destailleur
48ca7e4603
Typo
2018-09-23 15:47:13 +02:00
Laurent Destailleur
8aa22f2c33
NEW Add option to swap sender/recipient address on PDF
2018-09-23 14:57:44 +02:00
Laurent Destailleur
ac8f82338e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-21 11:12:27 +02:00
Laurent Destailleur
a078951a94
Add an help for user to avoid bad configuration
2018-09-21 11:12:08 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018
...
Missing translation
2018-09-21 09:50:18 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
36b8958c59
Move Stripe menu transactions and charges from develop to experimental
2018-09-20 19:35:13 +02:00
Laurent Destailleur
6793285997
Website
2018-09-20 14:38:18 +02:00
Laurent Destailleur
6e95fb5f05
Warning in website module
2018-09-20 14:36:13 +02:00
Laurent Destailleur
55e3d97842
Trans
2018-09-19 17:56:51 +02:00
Laurent Destailleur
09a41fd757
Look and feel v8
2018-09-19 17:33:50 +02:00
Philippe GRAND
c9b8da8acb
Missing translation
2018-09-19 16:06:39 +02:00
gauthier
d62118dca8
FIX : langs fr
2018-09-19 14:53:56 +02:00
Laurent Destailleur
7ca6b2603c
Trans
2018-09-19 12:25:07 +02:00
Laurent Destailleur
d35687c8b3
Work on module social network
2018-09-19 01:45:56 +02:00
Laurent Destailleur
014da6c22c
Fix translation
2018-09-18 18:11:07 +02:00
John BOTELLA
3fb2d4c159
remove change on text
2018-09-18 15:52:57 +02:00
Laurent Destailleur
1a1219ee2a
Trans
2018-09-18 14:52:50 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Laurent Destailleur
1e36aba35f
Trans
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-09-17 16:42:44 +02:00
Laurent Destailleur
d717e28338
Trans
2018-09-17 14:15:30 +02:00
Laurent Destailleur
f3ce7cb5a5
Quick hack to provide help to fix pb of undesirable files
2018-09-17 10:40:42 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Laurent Destailleur
eebd329c7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modFacture.class.php
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang
htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Laurent Destailleur
f88dba91ab
Trans
2018-09-15 14:15:21 +02:00
John BOTELLA
ec23cd0da4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files
2018-09-14 09:54:14 +02:00
Laurent Destailleur
765d8ec1fe
Better description
2018-09-12 21:33:48 +02:00
Laurent Destailleur
f46a137e25
Better description
2018-09-12 21:32:58 +02:00
Laurent Destailleur
c5e30b61c0
Fix translation
2018-09-12 21:25:14 +02:00
Laurent Destailleur
3dca02d25b
Fix translation
2018-09-12 21:07:34 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Laurent Destailleur
88192d1bae
Merge pull request #9456 from frederic34/stripeuser
...
add stripe user for actions
2018-09-12 18:37:31 +02:00
Laurent Destailleur
e89ff94d74
Update stripe.lang
2018-09-12 18:35:47 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
77d7c97750
Fix typo
2018-09-12 17:18:27 +02:00
Laurent Destailleur
48ae4de47b
FIX Add paypal error message in alert email
2018-09-12 16:11:10 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Frédéric FRANCE
5f1b3fbc12
add stripe user for actions
2018-09-10 20:18:16 +02:00
Laurent Destailleur
3de8381c20
Website module
2018-09-10 19:36:46 +02:00
Laurent Destailleur
538a2cc647
NEW Add first template of website
2018-09-08 13:55:15 +02:00
Laurent Destailleur
a2b71d9a7a
NEW Can delete a website in experimental website module
2018-09-08 12:04:40 +02:00
Laurent Destailleur
0ef17fe581
FIX Problems with permissions of module to record payment of salaries
2018-09-07 13:32:56 +02:00
Laurent Destailleur
c5695db3e4
NEW Can disable meteo on smartphone only
2018-09-06 11:09:51 +02:00
Laurent Destailleur
4ac67e6409
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:31:10 +02:00
Laurent Destailleur
e3339f5f95
Fix trad
2018-09-05 19:01:00 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Laurent Destailleur
9697bdf3b0
FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES
2018-09-04 10:38:09 +02:00
Laurent Destailleur
3d3edb19d8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Laurent Destailleur
df26ae764e
Fix typo
2018-09-01 17:56:52 +02:00
Laurent Destailleur
dfda029da4
FIX a removed option was still in setup
2018-09-01 17:44:07 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Laurent Destailleur
4d22c4f9f9
Typo
2018-08-30 11:37:06 +02:00
Frédéric FRANCE
285e231ea1
Update blockedlog.lang
2018-08-29 23:08:13 +02:00
Laurent Destailleur
2cf37f621c
Merge pull request #9267 from torvista/develop
...
Installer: set protocol of autofill of main url to match installer protocol
2018-08-29 21:47:31 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
1b542d5be3
Fix translation
2018-08-28 18:36:46 +02:00
Laurent Destailleur
b5c2383f65
Fix type of invoice encoded twice
2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109
Fix trans
2018-08-28 18:28:09 +02:00
Laurent Destailleur
bc31fa7fbf
Fix translation
2018-08-28 18:18:04 +02:00
Laurent Destailleur
bbc6255925
Fix missing language
2018-08-28 13:07:48 +02:00
Steve
6ecc6b8b48
Merge pull request #1 from Dolibarr/develop
...
update fork
2018-08-28 00:10:26 +02:00
Laurent Destailleur
36c7007aaa
Add control to avoid duplicate aliases
2018-08-20 19:10:33 +02:00
Laurent Destailleur
26d34422b0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-19 03:01:26 +02:00
Laurent Destailleur
cca0f4bf22
Fix translation
2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c
Fix trans
2018-08-19 01:51:45 +02:00
torvista
710ce6a9f7
Add description to database prefix field to avoid confusion when not specifying a database prefix.
2018-08-19 00:09:34 +02:00
Laurent Destailleur
9a82cc3261
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493
Fix missing translation
2018-08-18 02:55:22 +02:00
Laurent Destailleur
ab22c9d0de
Work on import
2018-08-16 21:48:16 +02:00
Laurent Destailleur
4e02b134da
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-16 14:50:04 +02:00
Laurent Destailleur
9f5cc2d05f
Fix menu entry
2018-08-16 10:33:20 +02:00
Laurent Destailleur
1922c3d881
Fix menu entry
2018-08-16 10:32:42 +02:00
Laurent Destailleur
2a69fa39d6
error message
2018-08-16 00:18:08 +02:00
Laurent Destailleur
4610b193bb
Add error message
2018-08-16 00:13:13 +02:00
Laurent Destailleur
ae9867eead
Work on website import
2018-08-16 00:03:19 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
b88c657a4a
Work on website import
2018-08-15 14:24:33 +02:00
Laurent Destailleur
df57bd176b
Fix translation
2018-08-13 14:53:04 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
John BOTELLA
6fad0ea5bd
Add retained warranty to pdf
2018-08-10 16:03:39 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
Laurent Destailleur
2dbb6e258b
FIX Can filter on month in export of blockedlog
...
FIX Fingerprint correct in popup
2018-08-09 22:29:02 +02:00
John BOTELLA
06be98c638
add date field
2018-08-08 17:36:39 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
florian HENRY
45a52a955e
NEW: Add optoin to display thirdparty adress in combolist
2018-08-06 10:52:10 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3
...
NEW : Add project on salaries
2018-08-02 11:19:34 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3
2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0
New : Add project on salaries
2018-07-31 07:45:03 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable
2018-07-26 09:41:44 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018
...
Clean and update code
2018-07-24 21:41:12 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +02:00
Chl
4995a0feb1
Translation: adding 'Enable' term in main
...
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.
Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
2018-07-24 00:38:48 +02:00
Laurent Destailleur
df7a3598a8
Trans
2018-07-23 10:56:28 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
f419964c76
Fix Debug website module
2018-07-20 15:01:50 +02:00
Laurent Destailleur
8247bb683c
Debug website module
2018-07-19 21:35:21 +02:00
Laurent Destailleur
7273cb97b2
Fix trans
2018-07-18 14:32:51 +02:00
Laurent Destailleur
19bb8a5091
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
6ad0cd37b0
Translation
2018-07-18 11:57:49 +02:00
Laurent Destailleur
4b044779dc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1
Fix label of copy must not be same
2018-07-17 22:31:28 +02:00
Laurent Destailleur
651ba74007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-16 15:45:50 +02:00
Laurent Destailleur
37e16b5ff2
Trans
2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff
FIX Init of contact in combo list when thirdparty not yet known
2018-07-16 10:46:10 +02:00
Laurent Destailleur
3710f95719
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/exports.lang
2018-07-16 10:01:23 +02:00
Steve
2cf28e055b
more minor grammar corrections
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/companies.lang
htdocs/langs/en_US/exports.lang
htdocs/langs/en_US/mails.lang
htdocs/langs/en_US/products.lang
htdocs/langs/en_US/sms.lang
2018-07-16 09:43:19 +02:00
Laurent Destailleur
ae76e61885
Merge pull request #9108 from torvista/misc-texts
...
more minor grammar corrections
2018-07-16 09:23:10 +02:00
Steve
bd9149e03b
more minor grammar corrections
2018-07-16 07:28:22 +02:00
Laurent Destailleur
a45ac4519a
Fix translation
2018-07-15 18:03:31 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
4c363d1d4f
Trans
2018-07-10 15:08:51 +02:00
Laurent Destailleur
64517d4c0b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/en_US/admin.lang
2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US
...
Texts corrections /langs/en_US
2018-07-10 10:41:28 +02:00
Laurent Destailleur
bd1e430a28
Synch transifex
2018-07-09 20:15:14 +02:00
Steve
e45e74a3bd
spelling and some grammar corrections to en_US
2018-07-09 17:38:28 +02:00
Laurent Destailleur
e0c3d176ed
Merge pull request #9067 from torvista/install-texts-en_US
...
spelling and some grammar corrections for installation texts en_US
2018-07-09 17:11:58 +02:00
Laurent Destailleur
291f149a9b
NEW Can set a tooltip help text on extrafields
2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867
Translation
2018-07-08 20:06:24 +02:00
Laurent Destailleur
8ec9257302
Fix translation
2018-07-08 20:03:14 +02:00
Steve
5944c161bc
spelling and some grammar corrections for installation texts en_US
2018-07-07 08:41:17 +02:00
Laurent Destailleur
303fb94acb
Fix trans
2018-07-06 13:04:37 +02:00
Laurent Destailleur
fb84211714
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb
Fix label
2018-07-06 12:45:20 +02:00
Laurent Destailleur
2a8f98be65
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:48:26 +02:00
Laurent Destailleur
da7b433cd0
Trans
2018-07-03 12:46:22 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
01e8f78c30
Trans
2018-07-03 09:58:36 +02:00
Laurent Destailleur
9c5d34fc5f
Fix translation
2018-07-02 12:26:32 +02:00
Laurent Destailleur
63f3143718
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30
Fix translation
2018-07-02 11:47:04 +02:00
Laurent Destailleur
11021353da
Fix text in payment area of crabe pdf
2018-07-02 11:33:33 +02:00
Laurent Destailleur
edd2e12b8d
css
2018-06-30 14:35:33 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop
...
NEW: ADD url to see the last version of a external module
2018-06-30 01:17:10 +02:00
Laurent Destailleur
932ff0be18
Trans
2018-06-29 19:16:29 +02:00
Laurent Destailleur
69e535cfc7
Trans
2018-06-29 12:47:06 +02:00
Laurent Destailleur
055d818069
FIX dashboard with IE10 not supporting flex
2018-06-28 12:09:13 +02:00
Laurent Destailleur
6fc6a743c8
Fix template email message html/nohtml
2018-06-27 12:11:49 +02:00
Laurent Destailleur
9eaca045e4
Fix default message with online payment link must be hidden when no
...
online payment mode exists.
2018-06-27 11:34:40 +02:00
Laurent Destailleur
4170e754d6
Fix trad
2018-06-26 18:16:25 +02:00
Laurent Destailleur
969b272576
Rename menu entries and report title for better understanding
2018-06-26 11:18:31 +02:00
John
008163628a
New pdf documents using new column system
2018-06-26 08:03:25 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
52eddbf809
Sync transifex
2018-06-26 00:29:50 +02:00
Laurent Destailleur
3615b7b45d
Fix missing translation
2018-06-24 15:44:13 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
eb88f1e5c9
Fix look and feel v8
2018-06-23 12:41:03 +02:00
Laurent Destailleur
604a5a3568
trans
2018-06-23 00:19:47 +02:00
Laurent Destailleur
c871e81a52
Trans
2018-06-23 00:15:57 +02:00
Laurent Destailleur
7daee6dc6b
A lot of fix of css and look and feel v8
2018-06-23 00:07:56 +02:00
Laurent Destailleur
77e7b5793f
Fix translation
2018-06-22 14:31:45 +02:00
atm-quentin
d8ebb5da8d
FIX trans
2018-06-22 11:02:20 +02:00
Marc de Lima Lucio
2fab4d7f76
FIX: proposal: missing contact type translation key
2018-06-20 14:56:24 +02:00
Laurent Destailleur
c3f64ed36e
FIX better text content for multipart email
2018-06-18 23:18:22 +02:00
Laurent Destailleur
92952aea28
Trans
2018-06-16 13:23:58 +02:00
Laurent Destailleur
5908fc1471
Trans
2018-06-16 13:15:24 +02:00
Laurent Destailleur
f5c08c4b9f
Doc website
2018-06-14 16:38:20 +02:00
Laurent Destailleur
f79466d483
Trans
2018-06-14 11:41:14 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
887c9e0495
Merge pull request #8922 from aspangaro/8.0-b31
...
NEW Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
2018-06-13 20:04:16 +02:00
Laurent Destailleur
ff002a45e0
Missing trans
2018-06-13 11:50:06 +02:00
Laurent Destailleur
b1986a8d2e
Fix trans
2018-06-12 19:22:28 +02:00
Laurent Destailleur
4313e41580
Start to fix pb with 3DS
2018-06-12 13:47:28 +02:00
Laurent Destailleur
94919d6e99
Translation
2018-06-11 15:17:05 +02:00
Laurent Destailleur
eb8d67483b
Fix message error
2018-06-11 10:40:57 +02:00
Laurent Destailleur
7562c13fad
The about page is now a README.md file
2018-06-11 09:32:41 +02:00
Laurent Destailleur
ab5ed6a3b5
Fix rename of ticket language file
2018-06-11 09:31:31 +02:00
Laurent Destailleur
31eeaf9914
Trans
2018-06-09 13:46:42 +02:00
Laurent Destailleur
186df884fa
Trans
2018-06-07 09:37:12 +02:00
Laurent Destailleur
74890ce656
Sync transifex
2018-06-06 12:02:33 +02:00
Laurent Destailleur
ac721b46bc
Trans
2018-06-06 11:16:42 +02:00
Laurent Destailleur
35ed49e575
Trans
2018-06-06 10:42:41 +02:00
Alexandre SPANGARO
f2c04c5653
Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
2018-06-05 20:37:39 +02:00
Laurent Destailleur
f28a6e59c8
Look and feel v8
2018-06-05 16:30:16 +02:00
Laurent Destailleur
7c82c74b6b
Fix install check
2018-06-05 08:57:04 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
eca66492ce
Merge pull request #8913 from aspangaro/8.0-a26
...
NEW : Accountancy Add import on general ledger
2018-06-04 14:02:34 +02:00
Laurent Destailleur
da44ea858c
Trans
2018-06-04 13:35:30 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
Alexandre SPANGARO
a3030e4057
Update works
2018-06-03 22:35:39 +02:00
Inovea Conseil
78b3067de3
NEW: ADD admin page for modulebuilder
...
ADD custom README
ADD choice to generate about page and documentation folder
2018-05-30 13:54:43 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
ATM-Nicolas
48a315f6cd
FIX : Bad substitution key used for default send proposal email
2018-05-30 10:14:34 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml
...
new : add adv targt emailing amdin with main feature level 1
2018-05-25 11:10:51 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26
...
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
2018-05-25 10:36:46 +02:00
Laurent Destailleur
de447d88d7
Fix translation
2018-05-24 11:51:32 +02:00
Laurent Destailleur
488c0c030e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2018-05-23 18:09:25 +02:00
Laurent Destailleur
4967c678b8
Fix translation
2018-05-23 18:05:19 +02:00
Laurent Destailleur
f074daae48
Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT
2018-05-22 20:17:31 +02:00
Laurent Destailleur
c141c3ecfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff
Fix missing lang
2018-05-21 19:35:12 +02:00
florian HENRY
22cdbffb0a
new : add adv targt emailing amdin with main feature level 1
2018-05-21 10:58:16 +02:00
Alexandre SPANGARO
c41a9291f1
Fix some problems & presentation
2018-05-20 07:46:02 +02:00
Alexandre SPANGARO
a4d3c4bed0
Fix language
2018-05-20 06:16:12 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation
...
Add credit note compatibility with situation invoice.
2018-05-18 11:34:10 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24
...
Update module assets
2018-05-18 09:05:46 +02:00
Laurent Destailleur
1581e73906
Trans
2018-05-17 18:04:30 +02:00
John
b01893d536
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull
2018-05-16 15:29:57 +02:00
John
05bb98f4c0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-05-16 11:49:37 +02:00
Laurent Destailleur
3e27d7dd2a
Report of turnover by vat rate / product type / country
2018-05-15 17:51:19 +02:00
Laurent Destailleur
d52305cef8
NEW Add entry for the GDPR contact
2018-05-15 11:50:42 +02:00
Laurent Destailleur
0c40dfa3f9
Translation
2018-05-13 14:30:48 +02:00
Alexandre SPANGARO
cb815e5e3b
Update works
2018-05-13 07:50:24 +02:00
Alexandre SPANGARO
9c6f92986e
Upgrade works
2018-05-11 21:48:22 +02:00
Laurent Destailleur
f5f734e8ef
Merge pull request #8756 from bafbes/abb7003
...
New : Translate accountancy journal menu entries
2018-05-10 11:58:26 +02:00
ATM-Nicolas
fb9ace010f
FIX : Missing translations
2018-05-07 17:16:20 +02:00
Abbes Bahfir
de8bd3f886
New : Translate accountancy journal menu entries
2018-05-07 08:43:41 +01:00
Abbes Bahfir
17b8de2cdd
New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED
2018-05-05 12:57:29 +01:00
Laurent Destailleur
564d791697
Merge pull request #8710 from atm-quentin/develop
...
NEW cancel orders on massaction
2018-05-05 12:54:31 +02:00
Laurent Destailleur
5cff4c152b
Add tab "time spent" in project view. Can swith gantt/list.
2018-05-04 11:25:21 +02:00
atm-quentin
f70df3490f
FIX add db commit
2018-05-03 10:53:24 +02:00
atm-quentin
ec5e84075e
NEW Rights to ignore price min
2018-05-03 10:18:38 +02:00
Laurent Destailleur
b21059ac25
Translation
2018-05-01 00:50:47 +02:00
Laurent Destailleur
9eea58e4c5
Translation
2018-04-30 20:19:28 +02:00
Laurent Destailleur
1bf56e58b3
Work on vat report
2018-04-30 18:21:04 +02:00
Laurent Destailleur
4c12369a26
Debug module ticket
2018-04-30 10:33:36 +02:00
Laurent Destailleur
19c12f3103
Translation
2018-04-30 09:31:09 +02:00
Laurent Destailleur
55f982e504
Removed deprecated FPDI option and reorganise PDF setup page
2018-04-30 09:28:24 +02:00
Laurent Destailleur
98ff3868a9
Fix translation
2018-04-29 20:11:17 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
e168240ab0
Debug module DAV
2018-04-29 18:32:15 +02:00
Laurent Destailleur
e8fd5ea5cd
Better translation
2018-04-28 17:18:38 +02:00
Laurent Destailleur
94d6e178f7
Work on vat report code rewrite
2018-04-28 16:06:46 +02:00
Laurent Destailleur
07b9a9b44d
Better US english
2018-04-28 13:08:09 +02:00
Laurent Destailleur
257dc1cf77
Work on rewriting VAT reports
2018-04-27 19:17:34 +02:00
Laurent Destailleur
39aef07c6b
FIX Only voters can send comments in public survey page
2018-04-25 17:14:18 +02:00
Laurent Destailleur
59d0e9a64f
trans
2018-04-25 12:36:16 +02:00
Laurent Destailleur
ae412f228d
NEW Experimental DAV module provides a public and private directory
2018-04-25 12:22:02 +02:00
Laurent Destailleur
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24
...
Fix Accountancy
2018-04-22 20:30:42 +02:00
Alexandre SPANGARO
034f7d56e4
Invert credit debit
2018-04-22 06:49:04 +02:00
Laurent Destailleur
f6743484dd
Better support of option COMPANY_AQUARIUM_CLEAN_REGEX
2018-04-21 00:58:42 +02:00
Laurent Destailleur
38d200d8a6
Fix left menu
2018-04-20 13:23:34 +02:00
Laurent Destailleur
9107701b8b
Move info into the README.md that is shown automatically.
2018-04-20 10:20:34 +02:00
Laurent Destailleur
9df179f48a
Clean lang file
2018-04-20 10:09:26 +02:00
Laurent Destailleur
7baf0eddbc
NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated
...
accounting account.
2018-04-20 01:10:57 +02:00
Laurent Destailleur
16e27a445b
Sort type of email template combo list
2018-04-19 20:42:03 +02:00
Laurent Destailleur
8aab183567
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-19 14:00:18 +02:00
Laurent Destailleur
fb3cae9ad3
Fix translation of country for GB
2018-04-18 11:36:44 +02:00
Laurent Destailleur
7256edc831
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-18 03:28:50 +02:00
Alexandre SPANGARO
e0c0f7fd9b
Fix Accountancy
2018-04-17 20:04:55 +02:00
Laurent Destailleur
eb3b351e83
Transifex sync
2018-04-17 16:17:07 +02:00
Laurent Destailleur
faea6861c3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
622042e9b2
FIX Max nb of generation of recurring invoice should not show warning
2018-04-16 15:05:35 +02:00
Laurent Destailleur
0d26bdcdc5
FIX Button receive products not visible
2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290
Fix translation of button action must be a verb
2018-04-16 11:12:56 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +02:00
Frédéric FRANCE
9a001ed203
Translation
2018-04-14 09:51:11 +02:00
atm-quentin
ba5ac47602
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
2018-04-13 15:48:58 +02:00
Laurent Destailleur
519ee64c1f
Translation
2018-04-13 00:42:08 +02:00
Laurent Destailleur
ace55ba569
Debug usage of extrafields for ticket module
2018-04-12 23:17:46 +02:00
Laurent Destailleur
a8878c3f7e
FIX #6295
2018-04-12 15:17:15 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser
...
NEW : Can select from the user list into send form email (For field to and CC)
2018-04-11 17:55:40 +02:00
Laurent Destailleur
7adbc473c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 13:26:37 +02:00
Laurent Destailleur
b652c53379
Sync transifex
2018-04-11 13:26:23 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15
2018-04-11 13:17:12 +02:00
Laurent Destailleur
bf1e3705fb
Fix english
2018-04-11 12:47:10 +02:00
Laurent Destailleur
aa3c81c8bd
Translation
2018-04-11 10:15:54 +02:00
Laurent Destailleur
5cdebb4daa
Fix typo
2018-04-11 10:00:53 +02:00
Laurent Destailleur
0dea2b08c2
Fix english translation of nb
2018-04-10 16:39:45 +02:00
Laurent Destailleur
7df0d01e01
Fix translation
2018-04-10 16:30:18 +02:00
Laurent Destailleur
a06c9df86c
Fix translation
2018-04-10 16:01:32 +02:00
atm-arnaud
26e9f10833
FIX #8389
2018-04-10 14:52:16 +02:00
John
24bf8cb162
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-04-09 16:21:37 +02:00
John
63180f45a8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-09 09:17:26 +02:00
Laurent Destailleur
6529043182
Clean code
2018-04-08 10:49:59 +02:00
Laurent Destailleur
98b9f6bb47
DAV module
2018-04-07 19:12:41 +02:00
Laurent Destailleur
4d2d9193b9
Work on VAT reports to use option MAIN_INFO_VAT_RETURN
2018-04-07 15:47:13 +02:00
Alexandre SPANGARO
741a14993a
NEW Add file number in accountant card and update export filename
2018-04-07 06:21:49 +02:00
Laurent Destailleur
ee870342ef
Fix navigation/translation
2018-04-06 20:22:20 +02:00
Laurent Destailleur
049b9b2a5f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-06 14:19:25 +02:00
Laurent Destailleur
8e778df0ff
Debug stripe module
2018-04-06 14:05:07 +02:00
Alexandre SPANGARO
06dc70df09
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-05 20:42:28 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm
...
NEW: send mails from project card
2018-04-05 16:39:06 +02:00
florian HENRY
cc0fb830b8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-04-05 10:53:17 +02:00
Frédéric FRANCE
90957b3a72
Update mails.lang
2018-04-04 16:00:33 +02:00
John
ce24ca08ee
move list of situation table and fix credit note display
2018-04-04 12:33:48 +02:00
John
299859d0c4
add action to remove from cycle
2018-04-03 17:34:20 +02:00
John
70321a8b71
add button to remove from cycle
2018-04-03 15:12:44 +02:00
John
b7681e7249
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-03 14:12:49 +02:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
Alexandre SPANGARO
2a50e9e6c4
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-02 19:54:30 +02:00
Alexandre SPANGARO
3779b6ff1c
Update work on assets type
2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04
Update works
2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7
NEW Module Assets
2018-04-01 21:26:52 +02:00
Laurent Destailleur
a9ac7e1f29
Debug inventory module
2018-03-31 19:20:38 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Marc de Lima Lucio
1cc816ff38
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-29 17:36:30 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse
...
NEW: default warehouse field for products
2018-03-29 13:51:37 +02:00
Laurent Destailleur
22d64a2768
Dolibarize module ticket
2018-03-29 12:50:03 +02:00
Marc de Lima Lucio
9ba902504e
FIX: langs
2018-03-29 09:38:16 +02:00
Laurent Destailleur
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Marc de Lima Lucio
3646374976
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
2018-03-28 11:54:21 +02:00
Laurent Destailleur
460344fbfb
Traduction
2018-03-27 16:02:06 +02:00
Laurent Destailleur
d1e9a4719b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2018-03-27 12:27:15 +02:00
Laurent Destailleur
a3851ec32a
Sync transifex
2018-03-27 12:23:39 +02:00
Laurent Destailleur
b44e791c0a
Work on vat reports
2018-03-26 21:39:18 +02:00
Laurent Destailleur
9f11cf77df
Merge ticket css in main css
2018-03-26 15:45:56 +02:00
Laurent Destailleur
89bf781fe6
FIX Add warning when expense report line not into range
...
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
2018-03-26 14:13:40 +02:00
Laurent Destailleur
8102ae6705
Work on setup for vat of product payments
2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750
More logical setup behavior
2018-03-25 17:53:32 +02:00
florian HENRY
ffbeb17ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-03-25 17:19:27 +02:00
Laurent Destailleur
852191010a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:29:11 +02:00
Laurent Destailleur
ab4f66009a
Translation
2018-03-24 00:00:35 +01:00
Laurent Destailleur
6e32e9961f
Syn transifex
2018-03-23 17:56:35 +01:00
John
88fab15c60
Change situation display
2018-03-23 17:12:09 +01:00
Laurent Destailleur
a15abb2ded
Update lang
2018-03-23 16:17:28 +01:00
Laurent Destailleur
c12469860a
Update lang
2018-03-23 16:17:10 +01:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
Laurent Destailleur
9980a5fbd0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-03-22 14:08:43 +01:00
Laurent Destailleur
99d88b0fa9
Merge pull request #8435 from enstentechnologies/7.0
...
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494
Update propal.lang
2018-03-22 14:04:33 +01:00
vabeltran
3793fd69e6
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
...
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4
Missing translation
2018-03-22 13:16:38 +01:00
Laurent Destailleur
68a4058387
Fix translation
2018-03-22 13:03:12 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
florian HENRY
e2e1fae5e6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-03-21 22:58:33 +01:00
Laurent Destailleur
35938b1942
NEW Variable __ONLINE_PAYMENT_URL__ available in email templates
2018-03-21 20:06:22 +01:00
Laurent Destailleur
517301f014
Work on subscription reminder
2018-03-21 16:40:09 +01:00
florian HENRY
dc6f4c1f4d
NEW : option to send email to salaries
2018-03-21 11:48:30 +01:00
Laurent Destailleur
d7ad899839
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/conf.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/holiday/list.php
2018-03-20 14:52:27 +01:00
Laurent Destailleur
67483eeb64
NEW Report a list of leave requests for a month
2018-03-20 13:42:29 +01:00
Laurent Destailleur
a325bbf865
FIX Input of holiday for subordinates was ko
2018-03-19 20:46:43 +01:00
Laurent Destailleur
0dc8d3cb00
Fix trad
2018-03-19 18:53:33 +01:00
Laurent Destailleur
0c45760dd4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
73eba91756
Fix translation of email message
2018-03-19 17:06:59 +01:00
Laurent Destailleur
eb03fb7540
Fix trad/compatibility
2018-03-19 15:00:50 +01:00
Laurent Destailleur
8889e7f4b2
FIX translation of holiday types
2018-03-19 14:09:44 +01:00
Laurent Destailleur
91b3ffc3da
Merge pull request #8409 from aspangaro/8.0-a10
...
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:40:44 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7
2018-03-19 12:18:18 +01:00
Laurent Destailleur
2ae1bb26c5
Update compta.lang
2018-03-19 12:14:43 +01:00
Laurent Destailleur
f46df6d8e5
Can resize and crop images in the ticketsup module
2018-03-19 11:49:05 +01:00
Laurent Destailleur
6ca40bcbd4
Fix translation
2018-03-19 11:01:44 +01:00
Laurent Destailleur
9aa4a90543
NEW Stripe online payments reuse the same stripe customer account
2018-03-19 10:57:19 +01:00
Laurent Destailleur
7e488c7ccd
Trans
2018-03-18 22:11:30 +01:00
Laurent Destailleur
e55c90b015
Fix translation
2018-03-18 20:29:36 +01:00
Laurent Destailleur
1bb4f3e07a
Dolibarrize module ticket
2018-03-18 20:20:10 +01:00
Laurent Destailleur
af44af0235
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-18 20:01:27 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
0c1e0f38d8
Merge pull request #8404 from OPEN-DSI/project_add_close_to_mass_update
...
NEW Add mass action on project's list to close projects
2018-03-18 12:28:03 +01:00
Alexandre SPANGARO
17b98b84ad
Merge remote-tracking branch 'uptream/develop' into 8.0-a10
2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0
NEW Add a tab to specify accountant/auditor of the company
2018-03-18 06:09:50 +01:00
Laurent Destailleur
7b71e29fa0
Duplicate translation
2018-03-17 15:17:35 +01:00
philippe-opendsi
452c9e22bb
Add mass action on project's list to close projects
2018-03-16 15:24:49 +01:00
Laurent Destailleur
9997a6c787
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-16 12:20:42 +01:00
Laurent Destailleur
a94017ba25
FIX letter for month March
2018-03-16 00:07:00 +01:00
Laurent Destailleur
46fb2945d4
NEW Show keyboard shortcut of nav arrow into tooltip
2018-03-15 22:02:03 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9
...
NEW Add stats in salaries module
2018-03-15 14:28:35 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
d804764134
Standardize look and feel
2018-03-15 10:41:43 +01:00
Alexandre SPANGARO
9ce6ab915c
Merge remote-tracking branch 'uptream/develop' into 8.0-a9
2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc
NEW Add stats in salaries module
2018-03-15 06:23:20 +01:00
Laurent Destailleur
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
cca1a58249
Can create card from dolibarr
2018-03-15 00:18:43 +01:00
Laurent Destailleur
bf4a0e46aa
Add a credit card on stripe
2018-03-14 21:07:45 +01:00
Laurent Destailleur
b232681318
NEW Add a button to create Stripe customer from the Payment mode tab
2018-03-14 16:53:16 +01:00
Laurent Destailleur
5c2a005e75
Work on generic customer payment modes
2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0
Can add/delete credit card localy
2018-03-14 11:51:13 +01:00
Laurent Destailleur
fe68e8acdd
Trans
2018-03-13 22:54:28 +01:00
Laurent Destailleur
c78e5d23ea
Work on the customer payment mode tab
2018-03-13 20:23:59 +01:00
Laurent Destailleur
60283a8205
Remove file incoterm.lang
2018-03-13 18:07:58 +01:00
Laurent Destailleur
3f490906f9
Trans
2018-03-13 17:52:15 +01:00
Laurent Destailleur
e6dd312bd5
Debug ticket module
2018-03-13 13:56:45 +01:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
Laurent Destailleur
f2bba8fb03
Fix translation
2018-03-12 20:11:34 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
cbbaf4763b
Start to introduce thirdparty website accounts
2018-03-12 16:04:23 +01:00
Laurent Destailleur
7362b3f3d7
Add table to store thirparty account in external web sites
2018-03-12 15:59:03 +01:00
Laurent Destailleur
98b7d4c2e2
NEW Can set the start/end date of service line in invoice templates
2018-03-12 12:27:40 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
Laurent Destailleur
6da3fbe3c9
Translation
2018-03-11 23:21:14 +01:00
Laurent Destailleur
51c94fadfa
Look and feel v7
2018-03-11 21:31:34 +01:00
Frédéric FRANCE
b04d38e760
Update ticketsup.lang
2018-03-11 20:16:06 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
Laurent Destailleur
dfb3d1b3bc
Merge pull request #8325 from inoveaconseil/develop
...
Add execution date on direct debit
2018-03-10 22:11:58 +01:00
Inovea Conseil
975300b90b
Add execution date on prelevement
2018-03-10 11:23:35 +01:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer
2018-03-09 22:44:57 +01:00
Marc de Lima Lucio
d6b4bc14e4
NEW: syslog file autoclean
2018-03-09 16:52:06 +01:00
Laurent Destailleur
7a277a8d2b
Debug list of charges. Compatible with the metadata FULLTAG used by
...
dolibarr native online payment page.
2018-03-08 21:32:52 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
e0af4f8489
Trans
2018-03-08 19:58:11 +01:00
Laurent Destailleur
b07fdafa65
Trans
2018-03-08 19:57:22 +01:00
Laurent Destailleur
235db1f405
Enhance OAuth module to store the stripe account in llx_oauth_token
2018-03-08 19:51:18 +01:00
Laurent Destailleur
0b316c3980
Attach invoice on email subscription confirmation
2018-03-08 15:01:34 +01:00
Alexandre SPANGARO
0182b724aa
Merge remote-tracking branch 'uptream/develop' into 8.0-a7
2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb
New : On invoice card, show accounting account linked
2018-03-08 06:52:31 +01:00
Laurent Destailleur
1419eaf15f
Debug last stripe PR
2018-03-07 15:05:49 +01:00
Laurent Destailleur
e242dbad88
Debug stripe
2018-03-07 14:44:32 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
...
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
Laurent Destailleur
f597e08d06
Merge branch 'develop' into 8.0-a6_vat
2018-03-07 12:23:43 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
fab007ad83
Remove deprecated option dolibarr_pdf_force_fpdf
...
Fix view of dolibarr setup config file
2018-03-07 09:41:27 +01:00
Laurent Destailleur
23a4a60970
Fix status of task
2018-03-06 21:51:43 +01:00
Laurent Destailleur
0dfc9af72a
FIX multicompany compatibility and fix reports
2018-03-06 19:58:13 +01:00
Laurent Destailleur
45fd0cfc16
FIX Subscription events not recorded into agenda
2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5
Fix triggers
2018-03-06 12:26:26 +01:00
Laurent Destailleur
a086bd0137
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Laurent Destailleur
a765dba570
Fix trad
2018-03-06 09:06:49 +01:00
Alexandre SPANGARO
4a46ffc5d8
Add information in VAT admin page
2018-03-06 05:02:09 +01:00
Laurent Destailleur
0cfa19ee09
NEW Online payment of invoice and subscription record the payment
...
automatically.
2018-03-06 00:12:23 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
864edce665
NEW Accept anonmymous events (no user assigned)
...
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
d8b2d1f8c2
Add example of test credit card
2018-03-04 12:11:28 +01:00
Laurent Destailleur
01b0336e9b
Fix tooltip on delete button
2018-03-03 12:10:27 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
2e6a2b59a0
Trans
2018-03-02 13:44:17 +01:00
Laurent Destailleur
2368cb615f
Look and feel v8
2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
f545d2a134
NEW Can add filter actiontype and notactiontype on event ical export
2018-02-28 20:06:28 +01:00
Laurent Destailleur
7d42ceab20
Use normalized substitution key
2018-02-28 19:50:40 +01:00
Laurent Destailleur
e2c7585ae7
NEW Support alternative aliases of page name in website
2018-02-28 14:36:22 +01:00
Laurent Destailleur
03858d73b1
NEW Add extrafield type "html"
2018-02-27 17:30:13 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
Laurent Destailleur
8d963adb43
Fix error message
2018-02-26 21:30:31 +01:00
Marc de Lima Lucio
7ca5ac03cc
FIX: discount card: only display relevant discounts types (customer/supplier)
2018-02-26 17:40:31 +01:00
Laurent Destailleur
82475e2e5f
WIP Option PROJECT_BILL_TIME_SPENT
2018-02-26 14:28:51 +01:00
Laurent Destailleur
cb45c86711
WIP Option PROJECT_BILL_TIME_SPENT
2018-02-26 13:21:16 +01:00
Laurent Destailleur
46c2f098e0
NEW Can enter time spent from the list of time spent of project
2018-02-26 12:21:01 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency
2018-02-26 09:54:09 +01:00
Laurent Destailleur
b42193b9ea
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-23 15:34:24 +01:00
Laurent Destailleur
953001c7ab
Fix bad naming of column
2018-02-23 15:16:49 +01:00
Laurent Destailleur
863cab362f
NEW Cat set the encryption algorithm for extrafields of type password
2018-02-23 14:38:41 +01:00
KHELIFA
54dba24ab5
Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-02-23 11:06:07 +01:00
John
b88e7fdcf9
move button to dialog footer
2018-02-22 17:21:12 +01:00
Laurent Destailleur
b87feab1e3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
0c59d536ba
More accurante message
2018-02-21 22:01:46 +01:00
John
629b8e618e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-02-21 11:45:23 +01:00
Laurent Destailleur
71cbcce3a2
NEW Can select sample to use when creating a new page
2018-02-20 18:10:11 +01:00
Laurent Destailleur
48d250b201
Help to understand
2018-02-20 15:55:58 +01:00
John
46b235c139
add auto select model when select type on create invoice
2018-02-20 15:08:57 +01:00
Laurent Destailleur
5f51af505f
NEW Can delete dir content in media and ECM module recursively
2018-02-19 23:52:45 +01:00
Laurent Destailleur
9230c6757b
Fix error when removing dir with some subdirs
2018-02-19 23:31:35 +01:00
Laurent Destailleur
bfbe03d55d
Fix tooltip doc
2018-02-19 21:57:30 +01:00
Laurent Destailleur
3eef9fd57a
Fix doc
2018-02-19 21:31:03 +01:00
Laurent Destailleur
1ee128ff13
NEW Add type of website container/page into dictionary
2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
44b0d1ca0f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-19 17:33:20 +01:00
Laurent Destailleur
f3114765a3
Work on website module
2018-02-19 16:46:29 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Laurent Destailleur
60a77a6d85
Add option to grab images into same dir or subdir
2018-02-19 14:56:37 +01:00
Laurent Destailleur
60fe1fa503
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
46c941c823
Translation
2018-02-16 23:57:35 +01:00
Laurent Destailleur
5c5d2cbefa
Fix smtp warning message
2018-02-16 23:49:08 +01:00
Laurent Destailleur
a4b155fc91
Fix typo and
2018-02-16 20:42:40 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
8493d9f62e
FIX #8163
2018-02-15 15:27:06 +01:00
Laurent Destailleur
5eee292663
FIX #8189
2018-02-15 13:40:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
18acff5e57
Fix avoid error when homepage not set
2018-02-15 01:29:51 +01:00
Laurent Destailleur
0fc302fe98
Sync transifex
2018-02-15 00:06:43 +01:00
Laurent Destailleur
f1a9f81fb4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
Laurent Destailleur
8783857aa5
Fix tooltip of website editor
2018-02-14 20:33:48 +01:00
Regis Houssin
fa2fddcdc1
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
2018-02-14 14:30:39 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Laurent Destailleur
1c9f543fd5
Translation
2018-02-12 15:55:37 +01:00
Laurent Destailleur
b2835fc803
Fix check of vat only for european countries
2018-02-12 15:54:24 +01:00
Laurent Destailleur
2fc97e5c8c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 14:01:34 +01:00
Laurent Destailleur
caa136bed3
FIX Debug journalization: Avoid journalizing if all lines not bound
2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f
Fix journalization protection
2018-02-12 12:02:01 +01:00
Laurent Destailleur
ec66bde3c9
Add option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-02-10 12:15:24 +01:00
Laurent Destailleur
e984d7df9f
NEW Add total of time spent in timespent page at top of page too.
2018-02-09 23:52:43 +01:00
Laurent Destailleur
eb8664e649
NEW Can export leave requests
2018-02-09 16:08:28 +01:00
Laurent Destailleur
26ee7ec5be
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2018-02-08 17:27:36 +01:00
Laurent Destailleur
b5c12b346c
Fix typo
2018-02-08 16:50:43 +01:00
Laurent Destailleur
19a0f552c9
Fix td balance
2018-02-08 16:50:01 +01:00
Laurent Destailleur
493a9a7289
Fix td balance
2018-02-08 16:49:28 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
9a4de796e1
Merge pull request #8048 from ATM-Nicolas/add_margin_filters
...
NEW : Add margin filters
2018-02-08 15:15:30 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
d8872a412b
Fix numbering for expense report
2018-02-07 15:52:57 +01:00
Laurent Destailleur
b95cd2f383
Fix translation
2018-02-06 19:33:31 +01:00
Laurent Destailleur
9962d36dbc
Fix translation
2018-02-06 18:39:11 +01:00
Laurent Destailleur
930d58ab96
Fix import supplier product price vat
2018-02-06 10:03:06 +01:00
Laurent Destailleur
bf7ae08c48
sync transifex
2018-02-06 01:17:50 +01:00
Laurent Destailleur
180f9918c7
Transifex sync
2018-02-05 20:43:50 +01:00
Laurent Destailleur
51847dfa8a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2018-02-05 15:34:50 +01:00
Laurent Destailleur
90bc859048
Fix trans
2018-02-05 02:34:49 +01:00
Laurent Destailleur
d24d401f3a
Fix translation
2018-02-04 10:55:09 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto
...
NEW Option to force all emails recipient
2018-02-03 19:15:11 +01:00
Laurent Destailleur
5c6dd0b061
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-03 19:00:04 +01:00
Laurent Destailleur
a41847d084
Fix: date of modificaiton in ledger not visible.
...
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
e9f8c7ba01
Fix edit of extrafields "link" corrupts the data definition
2018-01-31 10:51:40 +01:00
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user
...
NEW export filter models can be share or not by user
2018-01-29 21:19:50 +01:00
Laurent Destailleur
98c7ac9362
Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE
...
NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete
2018-01-29 21:08:18 +01:00
Laurent Destailleur
7bb46e65d7
Merge pull request #8103 from simnandez/7.0
...
Trad: more understandable extrafield translation to the end user
2018-01-29 20:45:42 +01:00
Laurent Destailleur
491e64db06
Fix various payments
2018-01-29 19:07:42 +01:00
Laurent Destailleur
4eb7d7a332
Debug blockedlog with various payments
2018-01-29 18:22:26 +01:00
Juanjo Menent
13adf06ae4
Trad: more understandable extrafield translation to the end user
...
Trad: fix english words
Trad: more accurate accounting translation
2018-01-27 15:48:11 +01:00
Laurent Destailleur
6cae36cc33
NEW Add key __USER_REMOTE_IP__ into available substitution variables
2018-01-26 17:23:30 +01:00
Laurent Destailleur
c5307e5cac
Fix option MAILING_LIMIT_SENDBYWEB
2018-01-26 15:12:40 +01:00
Rui Strecht
e3c939ac83
Merge branch 'develop' into label_for_MAIN_SHOW_REGION_IN_STATE
2018-01-26 11:08:01 +00:00
Laurent Destailleur
4f9f1b51d7
Fix translation
2018-01-26 01:34:49 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer
2018-01-25 22:03:51 +01:00
Laurent Destailleur
cff1dc6827
Rename
2018-01-25 17:57:49 +01:00
Laurent Destailleur
e9441f7881
Fix name of log module to avoid confusion with blocked log
2018-01-25 17:56:46 +01:00
Rui Strecht
496ac644eb
Updated label and added new translation for label
2018-01-25 16:10:04 +00:00
Laurent Destailleur
59c907260b
Export of unalterablelog must contains init hash
2018-01-25 13:18:52 +01:00
Laurent Destailleur
8d7f6843a4
Must be able to export lockedlog for a dedicated year.
...
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
d796f403a9
Fix sender email when sending a password remind
2018-01-24 15:43:55 +01:00
Laurent Destailleur
f3b89d9d39
Add missing trans
2018-01-24 14:47:52 +01:00
Frédéric FRANCE
7ac286463f
Update bills.lang
2018-01-22 17:23:59 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Maxime Kohlhaas
53e6da8c7c
Missing fetch and translation
2018-01-20 21:57:36 +01:00
Laurent Destailleur
9d0a0ed867
Fix demo
2018-01-19 12:55:03 +01:00
Laurent Destailleur
1730feeb4f
Fix error message
2018-01-18 17:52:48 +01:00
atm-quentin
ce29331c05
NEW Filter export model by user
2018-01-18 12:34:22 +01:00
Laurent Destailleur
2e0ec5e76a
Fix <br>
2018-01-17 13:17:33 +01:00
Laurent Destailleur
1a04178d64
Clean unused file and fix missing translation
2018-01-17 11:20:18 +01:00
Laurent Destailleur
926683763b
Modulebuilde fix sort of fields, fix generation of files
2018-01-15 17:38:15 +01:00
Laurent Destailleur
133e87fcc3
Sync transifex
2018-01-14 12:45:26 +01:00
Laurent Destailleur
5fb8672221
Fix blockedlog. Browser can be used with large amount of events
2018-01-12 20:24:09 +01:00
Laurent Destailleur
3423d4e6d3
Fix balance is amount after, so i fix by adding amount before
2018-01-12 13:35:53 +01:00
Laurent Destailleur
b225a6f79c
Better translation
2018-01-11 20:19:53 +01:00
Laurent Destailleur
e56d74f5c4
Fix generation of doc for supplier payment
2018-01-11 19:01:47 +01:00
ATM-Nicolas
30c6891b95
NEW : Add product categories filter on product margin
2018-01-10 11:17:23 +01:00
Laurent Destailleur
35a710a8ed
Missing translation
2018-01-05 17:50:05 +01:00
Laurent Destailleur
332ee53c22
Fix module blockedlog for donation
2018-01-05 12:43:53 +01:00
Laurent Destailleur
dbf7603118
Debug blockedlog for loi finance 2016
2018-01-05 04:31:48 +01:00
Laurent Destailleur
59ed23069c
Fix debug accounting module
2018-01-04 15:52:07 +01:00
Laurent Destailleur
04dd0663ff
Fix translation
2018-01-04 12:17:32 +01:00
Laurent Destailleur
534cbcb941
Debug translation
2018-01-03 20:59:35 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Maxime Kohlhaas
d770f73219
Add option translation
2017-12-26 16:21:15 +01:00
Laurent Destailleur
2b056b0177
BUG Fix of old hidden feature price per quantity
2017-12-22 12:53:46 +01:00
Laurent Destailleur
6a96a9765f
Transifex sync
2017-12-21 15:04:04 +01:00
arnaud
b1ce3fc5c8
FIX stats trad for customerinvoice
2017-12-21 12:12:50 +01:00
Laurent Destailleur
54d7d85d90
Sync transifex
2017-12-21 11:47:35 +01:00
Laurent Destailleur
e8a141aa63
Add uruguay languages
2017-12-21 11:37:51 +01:00
Laurent Destailleur
feaff433b8
Debug module website
2017-12-19 12:54:10 +01:00
Laurent Destailleur
89a62103ca
Debug module website
2017-12-19 11:40:29 +01:00
Laurent Destailleur
98b82d712a
NEW Revenue stamp can be a percent
...
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00
Laurent Destailleur
d895e1be9f
NEW Show list of tracked events into the module config page.
2017-12-16 22:26:25 +01:00
Laurent Destailleur
4abcbae79f
NEW The unalterable log can be browse by any user with he permission
2017-12-16 21:36:36 +01:00
Laurent Destailleur
fcf50c01b9
Fix translation
2017-12-16 15:33:29 +01:00
Laurent Destailleur
ebdbddb7fd
Fix error message and migration
2017-12-15 19:50:39 +01:00
Laurent Destailleur
5af153550d
Debug blockedlog:
...
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
2017-12-15 16:56:08 +01:00
Laurent Destailleur
541a1e0f7c
Better message
2017-12-14 17:26:12 +01:00
Laurent Destailleur
d7e5d554ab
Better message
2017-12-14 17:18:26 +01:00
Laurent Destailleur
cc2c31d940
Fix typo
2017-12-12 16:31:59 +01:00
Laurent Destailleur
9314dcb046
Fix regression
2017-12-12 10:13:48 +01:00
Laurent Destailleur
9880ef7364
Fix module website
2017-12-12 01:40:34 +01:00
Laurent Destailleur
c6c248fa28
Merge pull request #7930 from aspangaro/7.0-7
...
Fix : Accountancy some cleaning
2017-12-10 21:10:30 +01:00
Laurent Destailleur
748aee9a54
Fix javascript error
2017-12-10 19:54:04 +01:00
Laurent Destailleur
2dae21259e
Fix the switch show more/less
2017-12-10 19:03:18 +01:00
Laurent Destailleur
e1f0483b23
Fix grabber of url when url is on second level dir. More phpunits
2017-12-10 17:59:19 +01:00
Laurent Destailleur
57c7fa6ae9
Sync transifex
2017-12-10 01:17:32 +01:00
Alexandre SPANGARO
1269d98df2
Merge remote-tracking branch 'uptream/develop' into 7.0-7
...
# Conflicts:
# htdocs/accountancy/admin/export.php
# htdocs/accountancy/class/accountancyexport.class.php
# htdocs/accountancy/journal/expensereportsjournal.php
2017-12-09 06:14:34 +01:00
Alexandre SPANGARO
065ef4e5c2
Fix : Accountancy some cleaning
2017-12-09 06:00:13 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
56b5eab2e4
Merge pull request #7911 from atm-alexis/NEW_blockedlog_reset_warning
...
NEW warning on module blocked log reset if country code is FR
2017-12-08 13:47:44 +01:00
Laurent Destailleur
acd4e0b083
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-08 12:38:33 +01:00
Laurent Destailleur
df5768c176
Fix missing translation
2017-12-08 12:38:22 +01:00
alexis Algoud
62cd77d999
NEW automatic activation of external module on country set
2017-12-08 10:13:03 +01:00
Ion
669e080670
More informative error message in dynamics price
2017-12-06 14:51:29 +01:00
Alexis Algoud
ad46bf9a94
NEW option to avoid countries to disable there blockedlog
2017-12-05 18:30:48 +01:00
ATM-Nicolas
bdf1e30ef3
Merge branch 'develop' into 6.0_fix_project_conf
2017-12-05 12:20:48 +01:00
alexis Algoud
a2df87ab15
NEW warning on module blocked log reset if country code is FR
...
fix wrong paste click
2017-12-05 11:40:42 +01:00
Laurent Destailleur
8019f73f99
Fix: protection to not delete invoice if invoice is in bookkeeping
2017-12-05 10:01:30 +01:00
ATM-Nicolas
36bcd26e27
FIX : link project from other company conf
2017-12-05 09:21:24 +01:00
Laurent Destailleur
3cd7d0af11
Fix ref of invoice in blockedlog
2017-12-04 17:51:05 +01:00
Laurent Destailleur
0e4f82439b
Add event BILL_DELETE into blockedlog module
2017-12-03 21:47:37 +01:00
Laurent Destailleur
5d7214c4e8
Sync transifex
2017-12-02 15:20:59 +01:00
Laurent Destailleur
dc04ab3164
Missing field in website module
2017-12-02 13:24:21 +01:00
Laurent Destailleur
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +01:00
Laurent Destailleur
0a73daba01
Security: on target=_blank, we must have rel="noopener"
2017-12-02 03:04:52 +01:00
Laurent Destailleur
64d29709d5
FIX #7881 error not reported/blocking when subprodut need lot
2017-12-01 18:12:29 +01:00
Laurent Destailleur
a0231b5c60
Fix responsive
2017-12-01 12:55:28 +01:00
Laurent Destailleur
b871c7e6ca
Translation key
2017-11-30 15:16:01 +01:00
Laurent Destailleur
6796c08cb8
Debug/rewrite Blockedlog
2017-11-30 14:21:55 +01:00
Laurent Destailleur
dc692f333d
Work on blockedlog
2017-11-30 10:45:55 +01:00
Laurent Destailleur
9dcec5d6cf
Sync transifex
2017-11-28 12:32:23 +01:00
Laurent Destailleur
ef786f2271
Debug accountancy module
2017-11-28 11:31:55 +01:00
Laurent Destailleur
a15a57317b
Debug accountancy module
2017-11-28 11:12:13 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
Laurent Destailleur
48f226a825
Fix translation
2017-11-27 17:15:03 +01:00
Laurent Destailleur
f9e99e93c3
Fux utf8 trouble on direct printing message
2017-11-27 14:34:29 +01:00
Laurent Destailleur
69725fe62f
Fix setup of direct print with google docs driver
2017-11-27 13:55:27 +01:00
Laurent Destailleur
a0406bc741
Standardize view of events for products
2017-11-26 20:24:20 +01:00
Laurent Destailleur
ae906270f3
Debug module variant
2017-11-26 18:43:43 +01:00
Laurent Destailleur
1ec6c13ece
Debug module variant
2017-11-26 10:13:32 +01:00
Laurent Destailleur
3d48e509bd
Clean code
2017-11-25 19:16:15 +01:00
Laurent Destailleur
dbcb38dd3b
Use short label on table
2017-11-25 15:13:39 +01:00
Laurent Destailleur
c16a150a70
NEW Remove background on agenda view when event is a not busy event.
2017-11-24 20:02:46 +01:00
Laurent Destailleur
8659d97e97
Fix export of lot must use properties of lot from product_lot
2017-11-24 17:44:19 +01:00
Laurent Destailleur
295b4483d4
Enhance the repair.php tool
2017-11-23 13:23:16 +01:00
Laurent Destailleur
5fa8db1650
Work on timesheets
2017-11-22 21:19:40 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact
...
New multi contacts on actioncomm
2017-11-22 12:05:04 +01:00
Laurent Destailleur
a630e665d9
Work on modulebuilder
2017-11-21 11:50:57 +01:00
Laurent Destailleur
e19ca7b6d4
Work on generic filemanager
2017-11-20 18:19:41 +01:00
Laurent Destailleur
6953420ce8
Support for ar_EG as laternative of ar_AS
2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc
Work on public sharing files
2017-11-19 20:44:57 +01:00
Laurent Destailleur
04091e2c1a
Sync transifex
2017-11-19 20:43:04 +01:00
Laurent Destailleur
e4b91ceb38
Add ar_EG
2017-11-19 20:33:06 +01:00
Laurent Destailleur
304819a726
Work on module builder
2017-11-19 16:26:39 +01:00
Laurent Destailleur
47afe470eb
Merge small js into lib_header.js.php
...
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
atm-ph
15a8f2037b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-11-18 11:54:21 +01:00
Laurent Destailleur
cf0d67d71c
Generation of pdf become default value
2017-11-17 23:57:32 +01:00
Laurent Destailleur
ba372bfc5c
Fix typo
2017-11-16 23:11:49 +01:00
Laurent Destailleur
e06087888b
NEW Show line "other filtered task" when using filter on timesheet.
2017-11-16 22:55:04 +01:00
Laurent Destailleur
0d192df1fd
Standardize interface
2017-11-16 18:33:56 +01:00
Laurent Destailleur
5c3d8acfbb
Work on website
2017-11-15 19:47:07 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
501f5b8292
Merge duplicate translation key
2017-11-14 18:26:39 +01:00
Laurent Destailleur
f789714f14
Fix translation
2017-11-14 18:16:01 +01:00
Laurent Destailleur
fa92c53ff6
Fix pb when showing dictionaries
2017-11-14 11:13:24 +01:00
Laurent Destailleur
31e152274c
NEW Add 2 new automatic classification in workflow module
2017-11-14 01:00:57 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
2668b80599
Standardize code
2017-11-12 14:21:34 +01:00
Laurent Destailleur
b5d63de708
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-11 17:49:51 +01:00
Laurent Destailleur
7e1e710d28
Merge pull request #7796 from IonAgorria/fix-price-dynamic
...
Fix: price dynamic bugs
2017-11-11 17:49:00 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
...
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Laurent Destailleur
75e5d80eb6
Better help on mass invoicing from orders
2017-11-11 17:09:15 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
b8cbb84e7c
Clean code
2017-11-11 00:28:00 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Ion Agorria
aa0b811f73
Undefined variable detection in price parser
2017-11-09 17:12:55 +01:00
Laurent Destailleur
9f2e9ce6ef
Shorter translation
2017-11-07 19:38:31 +01:00
Laurent Destailleur
40cb301915
Merge pull request #7773 from frederic34/accountingexport
...
NEW Can setup csv accounting export from admin config
2017-11-06 19:06:06 +01:00
Laurent Destailleur
45fc5701ae
NEW Add a profile to import product translations
2017-11-06 12:59:58 +01:00
Laurent Destailleur
fa999dfa65
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
...
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
2017-11-06 09:25:14 +01:00
Frédéric FRANCE
ea910adeb2
Merge branch 'develop' into accountingexport
2017-11-05 21:11:41 +01:00
Frédéric FRANCE
bb252846e3
accounting export admin config
2017-11-05 11:48:41 +01:00
Alexandre SPANGARO
7d524f3364
Small code improve on bookkeeping card movement
2017-11-05 08:45:05 +01:00
Laurent Destailleur
141bef0b8a
Fix translation and css
2017-11-04 15:21:35 +01:00
Alexandre SPANGARO
7e3103356b
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-04 07:14:28 +01:00
Laurent Destailleur
cd70e1506b
Work on common core code
2017-11-03 17:20:08 +01:00
Laurent Destailleur
a346a1a5e9
Work on website module
2017-11-03 15:56:16 +01:00
Laurent Destailleur
458be3c814
Clean translation files
2017-11-03 14:38:00 +01:00
Alexandre SPANGARO
2d17e4094c
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00
Laurent Destailleur
e39c73a916
Fix translation
2017-11-02 14:16:28 +01:00
Laurent Destailleur
a98452ae36
Move translation
2017-11-01 10:52:42 +01:00
Laurent Destailleur
219364703f
Sync transifex
2017-11-01 10:48:21 +01:00
Alexandre SPANGARO
2a5382b24e
Add language
2017-11-01 07:24:48 +01:00
Laurent Destailleur
1db68b2a32
Translation
2017-10-31 19:37:41 +01:00
Laurent Destailleur
29bb0b37ef
Translation
2017-10-31 11:50:56 +01:00
Laurent Destailleur
b11727885e
Translation
2017-10-30 01:44:18 +01:00
Laurent Destailleur
bbe1c9c494
NEW Can download PDF document from the payment page
2017-10-30 00:45:47 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
90bd9f2f4f
Fix trad
2017-10-26 20:57:23 +02:00
Laurent Destailleur
4f6304624a
NEW Add api validate and close on contracts
2017-10-26 12:32:22 +02:00
Laurent Destailleur
e865f41b86
NEW Extrafields "link to object" now use a combo selection and getNomUrl
2017-10-26 02:55:43 +02:00
Laurent Destailleur
bb996019c2
NEW Support visibility on extrafields
2017-10-25 11:42:14 +02:00
Laurent Destailleur
d2f723045c
Work on website and modulebuilder
2017-10-24 17:30:05 +02:00
Laurent Destailleur
36ad17cc95
Work on module builder
2017-10-22 16:45:18 +02:00
Laurent Destailleur
1426737a26
Work on website
2017-10-21 12:26:14 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Laurent Destailleur
0e397b3e81
Work on website module
2017-10-20 18:44:03 +02:00
Laurent Destailleur
985675d680
Clean code
2017-10-20 18:04:46 +02:00
Laurent Destailleur
5c189449e1
Move default value for user expense report on tab expense report
2017-10-20 17:02:26 +02:00
Laurent Destailleur
6165bcdbd0
NEW Can export list of stock movements
2017-10-20 14:52:01 +02:00
Laurent Destailleur
5b70468cac
Better translation
2017-10-20 04:25:49 +02:00
Laurent Destailleur
a16f0e4356
NEW The gantt diagram is now sensitive to hours
...
NEW Add a group task line for tasks on same level on gantt diagram
2017-10-20 04:15:44 +02:00
Laurent Destailleur
413807708f
Move translation key into main file
2017-10-19 20:59:36 +02:00
Laurent Destailleur
abd5251330
Better responsive
2017-10-19 19:53:29 +02:00
Laurent Destailleur
f1a0e13718
Merge pull request #7646 from atm-maxime/new_hrm_detailed_user
...
NEW hrm details output on user
2017-10-19 19:21:29 +02:00
Laurent Destailleur
e41dcd173e
Sync language
2017-10-19 17:55:24 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Laurent Destailleur
3a97a3e2ad
Move key "Translation" into main file.
...
Add direct link to edit on transifex
2017-10-17 13:05:55 +02:00
Maxime Kohlhaas
25fa7d0564
New : add salaries, expense reports and leave requests in HRM tab of user card
2017-10-16 21:42:57 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
ec54621b62
FIX Tooltip using dialog are kept into visible screen
2017-10-13 11:08:30 +02:00
Laurent Destailleur
0ac33d46c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-13 10:35:38 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-10-13 09:52:56 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
Laurent Destailleur
a57fe329cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-12 23:49:48 +02:00
Laurent Destailleur
e0a8f03f06
Disable prof id 4,5,6 by default
2017-10-12 23:45:53 +02:00
Laurent Destailleur
45b4572ad4
Label shorter
2017-10-12 13:30:28 +02:00
Laurent Destailleur
7c29bb5818
Fix must use differently FRST and SEPA
2017-10-12 01:24:19 +02:00
Laurent Destailleur
99afa3a3e0
Use a shorter key for column title
2017-10-11 12:19:44 +02:00
Laurent Destailleur
f93ecc1584
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/projet/activity/perweek.php
htdocs/projet/element.php
2017-10-10 11:24:17 +02:00
Laurent Destailleur
0b7aa20464
Add link to ChangeLog
2017-10-09 22:52:26 +02:00
Laurent Destailleur
3b6f6c4027
Translation
2017-10-09 19:51:42 +02:00
Laurent Destailleur
dd69f76212
Move translation key
2017-10-09 19:21:25 +02:00
Laurent Destailleur
6402d5a2e4
Fix translation
2017-10-09 13:30:08 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Laurent Destailleur
ce7ce82801
Enhance email template editor
2017-10-08 14:51:10 +02:00
Laurent Destailleur
5d24aa4830
Fix sql
2017-10-07 14:54:31 +02:00
Laurent Destailleur
6a3be553f7
Start to work on common js part.
2017-10-07 03:08:01 +02:00
Laurent Destailleur
de71de61af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 18:52:38 +02:00
Laurent Destailleur
df38f60617
Export website into zip
2017-10-06 18:29:18 +02:00
KHELIFA
88ab3a9cab
Add a new notification for the event that has successfully closed a proposal.
2017-10-06 16:15:40 +02:00
Laurent Destailleur
7b853d8981
FIX #7567
2017-10-06 15:50:37 +02:00
Laurent Destailleur
d808add499
FIX #7567
2017-10-06 15:48:48 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
86e751bd45
Merge pull request #7563 from aspangaro/7.0-label_operation_on_general_ledger
...
Fix : problems on accountancy & presentation
2017-10-05 10:35:28 +02:00
Laurent Destailleur
4730611333
Add language file button
2017-10-05 09:54:48 +02:00
Alexandre SPANGARO
2f49b00f6c
Fix : some small problems on accountancy
2017-10-05 06:56:13 +02:00
Laurent Destailleur
10142522e0
Fix typo
2017-10-04 13:30:43 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Laurent Destailleur
75a7e086b3
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
...
New comment generic element
2017-10-04 11:13:39 +02:00
Laurent Destailleur
4c90e1c10d
Add link to modules Ids
2017-10-03 21:13:28 +02:00
Laurent Destailleur
3f3a5e0921
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
...
New custom meteo
2017-10-02 00:48:52 +02:00
Laurent Destailleur
94ae6c62e6
Add htmlheader field for each page
2017-10-02 00:08:00 +02:00
Laurent Destailleur
e13f29b4c8
Add ID of page
2017-10-01 21:29:49 +02:00
Laurent Destailleur
3ddd5d3d3a
The default value feature is sensitive to url parameters.
2017-10-01 14:54:17 +02:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Laurent Destailleur
7a0b8c3964
Translation
2017-09-27 18:23:49 +02:00
Laurent Destailleur
8242469e40
FIX The unique index on email templates can work now.
2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44
Add email template to send SEPA mandate
2017-09-27 17:40:14 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
Laurent Destailleur
e140878458
NEW Can import local tax rates in prices
2017-09-26 13:00:09 +02:00
Laurent Destailleur
74a2a4c257
Better translation
2017-09-26 12:34:18 +02:00
Laurent Destailleur
4f76545b62
Add missing fields to manage localtax on supplier products
2017-09-26 10:47:08 +02:00
gauthier
79049f55b7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_custom_meteo
2017-09-26 09:56:00 +02:00
Laurent Destailleur
f1791b5bf4
Better translation
2017-09-25 19:58:38 +02:00
Laurent Destailleur
845a33653a
Fix translation
2017-09-25 19:07:57 +02:00
Laurent Destailleur
dc362fcd30
NEW Can show currency in list of bank accounts
2017-09-25 18:11:03 +02:00
gauthier
3cec308586
NEW : langs
2017-09-25 17:19:56 +02:00
Regis Houssin
92ff974c5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-25 06:47:34 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Regis Houssin
06ee9f4775
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-24 16:10:55 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
b4e461e7ea
Debug modulebuilder
2017-09-23 18:17:34 +02:00
Laurent Destailleur
bee94b32d9
Debug modulebuilder
2017-09-23 15:12:25 +02:00
Laurent Destailleur
414f633e75
Fix css
2017-09-23 12:59:49 +02:00
Laurent Destailleur
57adc28256
Work on modulebuilder
2017-09-23 01:45:03 +02:00
Laurent Destailleur
96aed9c29d
Work on modulebuilder
2017-09-22 23:38:25 +02:00
Regis Houssin
791c385e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/adherents/card.php
2017-09-22 20:26:22 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
8578a1b825
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 17:04:26 +02:00
Laurent Destailleur
6d7db96359
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 16:31:05 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Laurent Destailleur
9875d20eaf
Add more columns in list of invoices templates
2017-09-21 18:35:47 +02:00
Laurent Destailleur
57358f0ce5
NEW Provide a way to download a file from a public URL for files in ECM
2017-09-21 14:02:42 +02:00
Laurent Destailleur
beac7a7439
Work on direct download links
2017-09-20 21:29:27 +02:00
Laurent Destailleur
0eb416d4af
Fix removal of a file
2017-09-20 20:41:40 +02:00
Laurent Destailleur
fc5c9ad2f2
Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling
...
Fix batch required for lot product error message.
2017-09-20 17:33:05 +02:00
Regis Houssin
1f59e4f7e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-20 12:47:35 +02:00
Laurent Destailleur
cfd29841e1
NEW Option STOCK_SUPPORTS_SERVICES become visible.
2017-09-19 23:42:20 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
6a0ef4b561
Fix info ot total in direct debit page
2017-09-19 19:29:00 +02:00
Laurent Destailleur
f87614e2d3
Fix missing translation
2017-09-19 19:12:54 +02:00
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Regis Houssin
f550e27579
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-18 12:15:01 +02:00
Laurent Destailleur
3f7b705674
Use correct term accounting for codes
2017-09-18 00:48:09 +02:00
Laurent Destailleur
e244ee6715
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-17 21:17:04 +02:00
Laurent Destailleur
196c5c1267
Missing translation
2017-09-17 20:51:06 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Regis Houssin
bdc425c203
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd
NEW add members types ldap group management
2017-09-16 21:41:30 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
318e285ba2
NEW Add protection to avoid to send to much emails using builk actions
2017-09-16 16:00:58 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
9077b5f374
Translation
2017-09-16 12:48:51 +02:00
Regis Houssin
9653280be9
New: big refactorization and uniformize code
2017-09-16 10:54:20 +02:00
Laurent Destailleur
a4086b52ef
NEW Can send email from contract card
2017-09-16 01:34:15 +02:00
Laurent Destailleur
8773a6860f
Fix HTML5 use of <br> is preferred to <br />
2017-09-15 23:49:04 +02:00
Laurent Destailleur
ffb3823655
Allow null in stock alert threshold to be compatible with #7162
2017-09-15 23:38:03 +02:00
Laurent Destailleur
77056d9adb
NEW All setup of accountancy can be done from menu "Accountancy-Setup"
2017-09-15 14:09:42 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
2f80618545
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
...
Fix task comment design
2017-09-14 12:21:58 +02:00
Laurent Destailleur
ed9c401ca6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 12:20:26 +02:00
Laurent Destailleur
225d78c767
Merge pull request #7383 from inoveaconseil/patch-8
...
add translation publisher
2017-09-14 12:15:32 +02:00
Laurent Destailleur
205989b64b
Fix phpunit
2017-09-14 09:16:57 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +02:00
Laurent Destailleur
e11c7a08ea
Fix translation
2017-09-13 14:24:03 +02:00
arnaud
ad017495f4
FIX task comment design
2017-09-13 12:09:01 +02:00
Laurent Destailleur
1a056d29d2
Debug search on dolistore
2017-09-12 21:02:18 +02:00
Inovea Conseil
f0e0df2660
add translation publisher
...
translation for modulehelp.php
2017-09-12 16:29:06 +02:00
Laurent Destailleur
3d4134df7a
Translation
2017-09-12 14:39:20 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
3001ee5fe7
Fix title of reports
2017-09-12 13:05:34 +02:00
Laurent Destailleur
d0a0bf57b6
NEW The "Show detail by account" accepts 3 values: yes, no, if non zero
2017-09-12 12:52:48 +02:00
Laurent Destailleur
cda8c6e41a
Fix ref must be 50
2017-09-12 11:51:51 +02:00
Laurent Destailleur
fcf82f1163
Enhancement into setup of member module
2017-09-12 11:17:23 +02:00
fappels
681c2a67bd
Fix batch required for lot product error message.
2017-09-11 23:22:44 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
591834a807
Add a message on payment forms
2017-09-09 09:54:42 +02:00
Laurent Destailleur
c498ce3c41
FIX journalization for bank journal should not rely on a label.
2017-09-08 17:50:39 +02:00
Laurent Destailleur
a6a142753a
Fix bad label when account not set
2017-09-08 15:24:27 +02:00
Laurent Destailleur
75172966c2
Fix selection of email templates
2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
b7197530c2
NEW Each user can edit its own email template (menu tools)
2017-09-08 12:48:01 +02:00
Laurent Destailleur
f92eded0a2
Merge pull request #7340 from Oeris/6.0-ficheinter
...
NEW Adds an option to hide duration in the "intervention" module
2017-09-07 18:07:14 +02:00
arnaud
82440fd399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
2017-09-07 16:24:34 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Neil Orley
e43b13968e
New: Adds an hide hour button in the "intervention" module
...
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
2017-09-07 15:31:19 +02:00
Neil Orley
b5c30ea679
New: Adds an hide duration button in intervention module
...
Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module
2017-09-07 11:58:22 +02:00
Laurent Destailleur
b4abb7151f
Use autocomplete on multi selection of accounts for group definition
2017-09-06 19:42:41 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
7a6f3d899c
Fix initial data
2017-09-06 19:21:46 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
0c066b471d
Debug modulebuilder
2017-09-05 22:33:55 +02:00
Laurent Destailleur
f23a681dc0
Clean code
2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da
Standardize code
2017-09-05 09:43:22 +02:00
Laurent Destailleur
e1fa37f7ff
Work on reports per date
2017-09-05 02:13:02 +02:00
Laurent Destailleur
3e9679f273
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-04 10:20:17 +02:00
Laurent Destailleur
c6cbf2345d
FIX Management of default value in extrafields when default is '0'
2017-09-03 14:25:54 +02:00
Laurent Destailleur
c1e54b7e23
Merge pull request #7315 from aspangaro/7.0-f2
...
NEW Add project on a various payment
2017-09-02 00:45:36 +02:00
Laurent Destailleur
d018bd4892
Merge pull request #7316 from aspangaro/6.0-rc_p4
...
FIX Missing language key "Events" everywhere
2017-09-02 00:00:10 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
9b51810653
Clean code
2017-09-01 17:30:09 +02:00
Laurent Destailleur
4660bc58fc
Fix nostop option
2017-09-01 17:08:47 +02:00
Laurent Destailleur
bda507d191
Fix nostop option
2017-09-01 17:07:26 +02:00
Laurent Destailleur
61cf69f2bb
NEW Include a color syntaxed HTML editor for emailing edition.
2017-09-01 13:09:13 +02:00
Laurent Destailleur
9a0576ff79
Enhance website module
2017-09-01 12:19:55 +02:00
Alexandre SPANGARO
be63eb8cef
Fix : missing language key "Events" everywhere
2017-09-01 07:34:01 +02:00
Alexandre SPANGARO
c4d2ca661f
Merge remote-tracking branch 'uptream/develop' into 7.0-f2
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-01 07:24:55 +02:00
Alexandre SPANGARO
84fcbb724e
Add project on various_payment
2017-09-01 07:21:27 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
atm-ph
8188abd4cd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-08-31 11:09:02 +02:00
Laurent Destailleur
9146bb336e
Work on merging all payment modes in one page
2017-08-31 03:34:57 +02:00
Laurent Destailleur
3e4a7ba97c
Update admin.lang
2017-08-30 16:46:50 +02:00
Laurent Destailleur
2c4e8cbb4a
Update admin.lang
2017-08-30 16:45:53 +02:00
Juanjo Menent
bfc5f01e1e
NEW Add detail of all tax rates into pdf column tax sale.
...
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
2017-08-30 14:36:00 +02:00
Laurent Destailleur
6c202c5fa1
Fix vat rate to show and not vat amount
2017-08-29 19:55:49 +02:00
Laurent Destailleur
4d908c2dd0
Merge pull request #7299 from atm-maxime/new_expense_numbering
...
New : add expense report numbering mask
2017-08-29 18:24:17 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
21a7fcb01a
Fix substitution when sending emails
2017-08-28 12:18:18 +02:00
Maxime Kohlhaas
a288ee65e0
Add lang trans
2017-08-27 18:02:35 +02:00
Laurent Destailleur
64bbf35812
Debug modulebuilder
2017-08-27 13:28:37 +02:00
Laurent Destailleur
76b4a2ce06
Can set language file to use for label key of extra field
2017-08-27 12:52:26 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
b3f77ed9f7
Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec
...
NEW extrafield on facture_rec
2017-08-26 19:26:09 +02:00
Laurent Destailleur
55c4ef7ffc
Merge pull request #7227 from Darkjeff/dev-report
...
Dev report from bookkeeping
2017-08-26 19:20:57 +02:00
Laurent Destailleur
77af3b96d3
Showempty on language list
2017-08-26 18:45:10 +02:00
Laurent Destailleur
5ed22b64fb
Show if module add objects tables
2017-08-26 16:04:24 +02:00
Laurent Destailleur
632119a5c5
Show if module add dictionary data
2017-08-26 15:46:35 +02:00
Laurent Destailleur
f2a437fa89
Enhance modulebuilder
2017-08-26 15:22:13 +02:00
Laurent Destailleur
54cc1ac800
Merge emailing target selectors.
2017-08-25 21:20:27 +02:00
Laurent Destailleur
99a27162fb
Complete module template
2017-08-24 20:17:23 +02:00
Laurent Destailleur
d8ead2693f
Fix field position
2017-08-24 17:59:20 +02:00
Laurent Destailleur
7d9a18a63d
Fix sql error
2017-08-24 15:39:23 +02:00
John
0653a5d177
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
2017-08-24 14:35:01 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Laurent Destailleur
17f44ad980
NEW Can make a specific setup for SMTP sending for emailing module
2017-08-24 02:02:00 +02:00
John
b18104788e
New extrafield on facture_rec
2017-08-22 15:22:41 +02:00
Laurent Destailleur
14cd150762
NEW Introduce experimental feature to search dolistore from application
2017-08-22 14:47:01 +02:00
Laurent Destailleur
5cf684f5a2
NEW Popup for preview of image add a button "Original size"
2017-08-22 13:14:10 +02:00
Laurent Destailleur
1fe23e3fec
Move french text into english
2017-08-22 09:24:26 +02:00
Laurent Destailleur
348a42542d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/theme/eldy/style.css.php
2017-08-21 13:29:08 +02:00
Laurent Destailleur
e8a2680e31
Sync transifex
2017-08-21 13:26:56 +02:00
Laurent Destailleur
0e173d85ae
Fix translation
2017-08-21 13:01:14 +02:00
Laurent Destailleur
b48f501a0c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-21 11:04:09 +02:00
Laurent Destailleur
84d584f607
Missing translation
2017-08-21 01:39:22 +02:00
Laurent Destailleur
4f6363bff8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-21 00:49:47 +02:00
Laurent Destailleur
2321091170
NEW Move the upload input on top right in ECM module
2017-08-20 21:23:19 +02:00
Laurent Destailleur
188653a85d
Work on website module
2017-08-20 18:50:51 +02:00
Laurent Destailleur
1101a1094f
Fix translation and migration
2017-08-20 16:07:38 +02:00
Laurent Destailleur
5c5c4046a1
Prepare setup for email reminder
2017-08-20 16:07:22 +02:00
Laurent Destailleur
22a7c9bd6b
Merge pull request #7220 from guerrierk/develop
...
NEW|Add possibility to propose last num releve in conciliation
2017-08-17 23:42:07 +02:00
Laurent Destailleur
702ecffa3c
Debug modulebuilder
2017-08-05 10:35:12 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
00a1893d93
Better help
2017-08-03 12:04:13 +02:00
Laurent Destailleur
8cd2235b4b
Start to introduce cron for email reminder.
2017-08-03 11:42:22 +02:00
Laurent Destailleur
a8e2f95c39
Better help
2017-08-03 10:47:35 +02:00
Laurent Destailleur
c43df7cda8
Fix translation
2017-08-02 22:47:06 +02:00
Laurent Destailleur
92d45a9dc0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-02 22:31:05 +02:00
Laurent Destailleur
c38d59a4b6
Fix regression
2017-08-02 22:26:01 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
32eb2aba43
Sync transifex
2017-08-02 15:30:46 +02:00
Laurent Destailleur
c8b79214cd
Fix translation
2017-08-02 14:53:42 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
33d6903d3f
Fix bad recipient when using mass actions
2017-08-02 11:39:11 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
ecb4eebfac
Fix filter of project in timespent view
2017-07-31 06:58:55 +02:00
Laurent Destailleur
52875c08ff
Fix missing translation keys
2017-07-31 04:24:13 +02:00
Laurent Destailleur
69357dd91c
Merge pull request #7113 from atm-ph/new_develop_expense_report
...
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
8c287174b0
Merge pull request #7215 from aspangaro/6.0-d1
...
Debug various_payment
2017-07-31 02:32:46 +02:00
GUERRIER Kevin
ded6b40489
Add possibility to propose last num releve in conciliation
2017-07-29 14:21:58 +02:00
Laurent Destailleur
6253986ae5
Fix translation source
2017-07-28 23:32:29 +02:00
Laurent Destailleur
b0e62f9d24
Enhance image replacement
2017-07-28 17:17:40 +02:00
Laurent Destailleur
46586f3055
Can export Websites pages.
...
Work on export to be able to use the generic declaration of fields.
2017-07-28 14:54:13 +02:00
Alexandre SPANGARO
95672e3bf0
Merge remote-tracking branch 'uptream/6.0' into 6.0-d1
2017-07-28 06:40:47 +02:00
Alexandre SPANGARO
fb4727c408
Add a specific entry in tax menu for various payment
2017-07-28 06:27:04 +02:00
atm-ph
1f3f9e40b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-27 16:01:53 +02:00
Darkjeff
6a3af93618
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into dev-report
2017-07-26 16:02:41 +02:00
Laurent Destailleur
8c681f6a96
Code ment
2017-07-26 12:08:38 +02:00
Laurent Destailleur
9ca874fde4
Add cronjobs view in modulebuilder
2017-07-26 10:11:39 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
c386a02889
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2017-07-25 21:10:08 +02:00
Laurent Destailleur
cba898e2b9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
bfd1fa3984
Enhance modulebuilder
2017-07-25 02:56:19 +02:00
Laurent Destailleur
13cd203502
Enhance modulebuilder
2017-07-25 01:54:54 +02:00
Laurent Destailleur
1d7674906f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-25 00:23:09 +02:00
Laurent Destailleur
4ae60284fb
Debug modulebuilder
2017-07-25 00:03:29 +02:00
Laurent Destailleur
1877a3b6fa
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-24 21:04:07 +02:00
Laurent Destailleur
dcb79e66cc
Debug modulebuilder
2017-07-24 13:55:12 +02:00
Laurent Destailleur
6421ec3139
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
2017-07-23 19:27:40 +02:00
Laurent Destailleur
7904e994a7
FIX When disconnected, the search box jump to login instead of error.
2017-07-22 23:43:40 +02:00
Laurent Destailleur
764c7ac792
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/websites/index.php
2017-07-22 20:46:02 +02:00
Laurent Destailleur
583452114b
Split editor in 2 (html source and wysiwyg)
2017-07-22 20:19:10 +02:00
Laurent Destailleur
2a133f4a3f
Generate table for extrafields
2017-07-22 20:12:00 +02:00
Laurent Destailleur
437d620fe4
Add support of language in website module
2017-07-22 20:01:29 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
9e6666e511
Fix translation keys for taxes
2017-07-22 16:40:19 +02:00
hguibourgdev
1f5a71f2c9
New : Prepare toolkit for alert warning
2017-07-22 12:18:54 +02:00
Laurent Destailleur
5207b84e8b
Fix compatibility with indian IGST/CSGST/SGST
2017-07-22 01:56:38 +02:00
Laurent Destailleur
7562412554
Minor fixes
2017-07-22 01:21:28 +02:00
Laurent Destailleur
f64a9968a9
Debug modulebuilder
2017-07-22 01:00:43 +02:00
Laurent Destailleur
f97ecd0a45
The css files is also parsed with function to clean images
2017-07-21 20:16:53 +02:00
Laurent Destailleur
2514c02817
Fix when there is several php part in same page
2017-07-21 19:01:06 +02:00
Laurent Destailleur
3716645b8b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-21 15:03:21 +02:00
Laurent Destailleur
5f4dd26303
Merge pull request #7182 from hregis/develop_trad
...
NEW add specific translation for title of documents (Invoice, Order, Proposal)
2017-07-21 14:59:58 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Laurent Destailleur
aacef21cb8
Can clone a page
2017-07-21 13:38:13 +02:00
Regis Houssin
48d79357a0
New: add specific translation for title of documents
2017-07-21 10:03:09 +02:00
Laurent Destailleur
302ee97d31
Debug module website
2017-07-21 02:51:56 +02:00
Laurent Destailleur
28254655e9
Debug module website
2017-07-21 02:30:02 +02:00
Laurent Destailleur
7760594643
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
htdocs/theme/eldy/style.css.php
htdocs/websites/class/website.class.php
htdocs/websites/index.php
2017-07-20 18:31:58 +02:00
Darkjeff
dcc3febf6f
add bookkkeeping in report turnover
2017-07-20 18:22:53 +02:00
Laurent Destailleur
2f3128410b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-20 16:49:56 +02:00
Laurent Destailleur
3b8f60f90e
Fix pb of recursive include in website module
2017-07-20 16:49:20 +02:00
Laurent Destailleur
1e7aa4d9b4
Work on module website
2017-07-19 16:38:00 +02:00
cam.lafit
f0d95fcbd9
fixup! Allow RUM on creation step
2017-07-19 16:29:56 +02:00
Laurent Destailleur
74db61ce15
Fix translation
2017-07-19 15:50:57 +02:00
Laurent Destailleur
5c296c679e
Enhance source code editor
2017-07-18 13:42:07 +02:00
Laurent Destailleur
b6c9823ad4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-17 16:45:47 +02:00
Laurent Destailleur
b075f7a459
Incomplete translation
2017-07-17 16:32:10 +02:00
Laurent Destailleur
d832bfc056
Some fix into dol_compress_dir function.
2017-07-17 11:05:38 +02:00
Laurent Destailleur
330f3af74d
Fix pb in recursive dol_dir_list return.
2017-07-17 10:26:36 +02:00
Laurent Destailleur
4d9ae5bb44
Work on modulebuilder
2017-07-16 14:57:30 +02:00
Laurent Destailleur
816db0e856
Add protection against duplicate moduel with similar names
2017-07-16 13:25:10 +02:00
Laurent Destailleur
5c0e581d5a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-16 13:01:07 +02:00
Laurent Destailleur
7b2a71802b
Do some TODO on modulebuilder module.
2017-07-16 13:00:35 +02:00
Laurent Destailleur
75ec7a309c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-15 21:25:14 +02:00
Laurent Destailleur
d671421b8b
Fix journalization of vat payments
2017-07-15 18:29:18 +02:00
Laurent Destailleur
fa00373e56
Fix remove log
2017-07-15 17:52:30 +02:00
Laurent Destailleur
a20bf05c64
Debug journalization
2017-07-15 17:32:22 +02:00
Laurent Destailleur
c6dcccba18
Fix better warning when record will be saved into a waiting account.
2017-07-15 14:55:04 +02:00
Laurent Destailleur
1735a649e9
Fix permission on salary module
2017-07-15 13:02:41 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +02:00
Laurent Destailleur
3ac85e10c5
NEW Add mass action "validate" on supplier invoices.
...
NEW Add date_valid and date_pointoftax on supplier invoices.
2017-07-14 14:40:09 +02:00
Laurent Destailleur
f9a99f506f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-14 00:17:49 +02:00
Laurent Destailleur
652d715fdc
Better translation
2017-07-13 18:18:56 +02:00
Laurent Destailleur
743de4e586
FIX Option to classify proposal/order in workflow module must not set
...
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
2141cfb282
Fix code of triggers (disabled if module not enabled)
2017-07-13 11:25:25 +02:00
Laurent Destailleur
028f1f5133
Fix default currency in creation form.
2017-07-13 10:16:40 +02:00
Laurent Destailleur
9127892c71
Fix several minor bugs
2017-07-13 02:33:48 +02:00
Laurent Destailleur
3fae3a9eda
Fix typo
2017-07-13 00:44:04 +02:00
Laurent Destailleur
23fbef3dae
Fix the delete dir functions does not return real nb of deleted files.
2017-07-13 00:26:05 +02:00
Laurent Destailleur
0d4d4516c8
Fix template for css and js
2017-07-12 22:52:56 +02:00
Laurent Destailleur
24863337da
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-12 20:34:22 +02:00
Laurent Destailleur
a487492a7a
Fix purge of log files was missing some log files.
2017-07-12 20:23:35 +02:00
Laurent Destailleur
33ceb22b8b
Fix error management into modulebuilder
2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15
Debug modulebuilder
2017-07-12 11:52:07 +02:00
Laurent Destailleur
11cc1f04c4
Work on modulebuilder
2017-07-12 01:55:07 +02:00
Laurent Destailleur
b016b1ca5f
Fix typo
2017-07-11 23:19:47 +02:00
Laurent Destailleur
ceeb9d7f1b
Debug modulebuilder
2017-07-11 20:47:49 +02:00
Laurent Destailleur
be09c911ce
Debug module websites
2017-07-10 23:44:46 +02:00
Laurent Destailleur
6b4cecd0a8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-09 19:43:21 +02:00
Laurent Destailleur
e3943155f3
Sync transifex
2017-07-09 19:32:35 +02:00
Laurent Destailleur
9fc17d8988
Translation
2017-07-09 13:43:23 +02:00
Laurent Destailleur
4d560a8e03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-08 22:18:12 +02:00
Laurent Destailleur
a562e5a919
Maxi debug of accountancy ledger page.
2017-07-08 20:52:53 +02:00
Laurent Destailleur
cf6745b1ae
Debug module builder
2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888
Debug modulebuilder
2017-07-08 15:43:36 +02:00
AlainRnet
8d1c8e2da7
Update main.lang
...
StatusInterInvoiced missing and I don't know its wording.
2017-07-08 08:09:02 +02:00
Laurent Destailleur
a9468ad84a
Look and feel v6
2017-07-08 00:42:55 +02:00
Laurent Destailleur
de24e93cca
Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list
...
NEW: Add column with nbr suppliers prices and WAP to product list.
2017-07-07 19:42:25 +02:00
Laurent Destailleur
8abec461a6
Fix total with tax does not include local taxes. To solve, i show both
...
totals.
2017-07-07 12:31:00 +02:00
Laurent Destailleur
de1a7042d4
Fix filter on list of actions
2017-07-07 10:55:42 +02:00
phf
6ab0ec4b1b
Fix travis and rename 2 fields
2017-07-07 10:22:37 +02:00
phf
49b8689f2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-07-05 11:02:39 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
Laurent Destailleur
95cf36c43b
Fix use the getUrl function instead of hard coded curl
2017-07-04 10:55:53 +02:00
Laurent Destailleur
0ee93fb00c
Fix conflict between option login and logina and logint in agenda export
2017-07-04 10:29:38 +02:00
Laurent Destailleur
cb1c461b69
Work on module builder
2017-07-03 12:28:52 +02:00
Laurent Destailleur
8b91f4fb5e
Debug module website
2017-07-03 12:04:45 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Laurent Destailleur
565de9bc8d
Debug module website
2017-07-02 23:38:19 +02:00
Laurent Destailleur
b7218c1bcd
Fix menu consistency
2017-07-01 03:18:17 +02:00
Laurent Destailleur
31fe8ebcee
Debug v6
2017-07-01 02:22:08 +02:00
fappels
989084e4de
WAP always 2 decimals
2017-06-30 10:56:05 +02:00
Laurent Destailleur
f7ba3ddc07
Fix translation
2017-06-29 15:59:46 +02:00
Laurent Destailleur
7e6e0ee3a4
Fix link to image of MD files
2017-06-27 20:02:46 +02:00
Laurent Destailleur
5dd8d1c4ef
Rename button to make clear for user that the export is not the real
...
journal but a temporary situation.
2017-06-27 17:56:45 +02:00
fappels
e3f7402e07
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list
2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a
Create patch
...
Add Number of supplier prices and wap columns
2017-06-26 22:44:56 +02:00
Alexandre SPANGARO
459fac4753
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
...
# Conflicts:
# htdocs/accountancy/customer/index.php
2017-06-22 05:30:21 +02:00
Alexandre SPANGARO
c381c213a5
Fix : Accountancy
2017-06-20 06:52:41 +02:00
Laurent Destailleur
fcdc7b1a0d
Fix pgsql compatibility
2017-06-20 01:53:34 +02:00
Laurent Destailleur
3717a01641
Fix lang
2017-06-19 23:15:47 +02:00
Laurent Destailleur
8dffc38cd5
Fix separator
2017-06-19 21:46:38 +02:00
Laurent Destailleur
504d376f84
Sync transifex
2017-06-19 21:34:33 +02:00
Laurent Destailleur
de423e531c
Sync nb_NO
2017-06-19 21:24:55 +02:00
Alexandre SPANGARO
e9b6afd2aa
Add last session coding - Add temporaly ledger
2017-06-18 22:17:32 +02:00
Laurent Destailleur
787d6946b2
Continue work started on module builder
2017-06-18 12:30:18 +02:00
Laurent Destailleur
69b26dcb4e
Work on modulebuilder
2017-06-17 21:23:52 +02:00
Laurent Destailleur
a6b4b15e07
Work on modulebuilder
2017-06-17 19:40:48 +02:00
Laurent Destailleur
b73228899a
Merge pull request #7024 from defrance/patch-14
...
Introduce weight conversion lb & oz
2017-06-17 17:52:20 +02:00
BENKE Charlene
db17363267
Update other.lang
2017-06-17 16:30:37 +02:00
Laurent Destailleur
8a1de52f3c
Fix translation
2017-06-17 12:00:33 +02:00
Laurent Destailleur
a4f34539ea
Fix translation
2017-06-17 11:46:45 +02:00
Laurent Destailleur
7c41c9a3e4
Fix activation of dependency for a dedicated country.
...
BlockedLog depends now on CashDesk only.
2017-06-17 11:43:00 +02:00
Laurent Destailleur
bebe7baa80
Fix images into medias not reabable into send emails
2017-06-17 10:44:08 +02:00
BENKE Charlene
f0bc72cda4
WeightUnitonce translation
2017-06-17 10:27:00 +02:00
Laurent Destailleur
5b7a8e9c90
Fix missing signature when sending email from user card
2017-06-17 10:17:36 +02:00
Laurent Destailleur
1c8daf9700
Standardize and debug code of module BlockedLog
2017-06-16 12:46:15 +02:00
Laurent Destailleur
26e80045a6
Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW log download or preview event on a validate bill
2017-06-16 11:06:27 +02:00
Laurent Destailleur
343e8d8498
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-16 00:49:52 +02:00
Laurent Destailleur
ac708a8ee9
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-15 23:58:56 +02:00
Laurent Destailleur
097be322a6
Modify code to match new v6 structure.
2017-06-15 19:29:00 +02:00
Laurent Destailleur
0b6d7a5b57
Modulebuilder
2017-06-14 12:05:47 +02:00
alexis Algoud
ef0907d89e
NEW log download or preview event on a validate bill
2017-06-13 15:55:22 +02:00
Laurent Destailleur
1519d0eb95
Merge pull request #6994 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW blocklog view, export and fix
2017-06-13 15:00:47 +02:00
Laurent Destailleur
c0f46834cb
Fix demo links
2017-06-13 13:22:05 +02:00
alexis Algoud
f780af305a
NEW blocklog other things
...
fix minor
add view only for error
add download log as csv
add record event on bill send by mail event
2017-06-13 10:04:05 +02:00
Laurent Destailleur
ecf29332f3
Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW Blokedlog stuff
2017-06-12 17:44:27 +02:00
Alexis Algoud
0312d2479d
add block info popin, translation, hidden authority feature
2017-06-12 10:26:24 +02:00
Laurent Destailleur
277dde5d61
Fix dol_banner
2017-06-12 10:25:28 +02:00
Laurent Destailleur
542a72c684
NEW custom dir is enabled dy default on first install.
...
Fix modulebuilder when custom dir not defined.
2017-06-10 23:50:46 +02:00
Laurent Destailleur
58a407d9f1
Fix style and align when no permission on widget
2017-06-10 00:05:47 +02:00
Laurent Destailleur
b92980c6ff
Fix statistics on products
2017-06-09 10:38:06 +02:00
phf
d6d451b54a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-06-08 12:03:59 +02:00
phf
711f9696aa
New multi contacts on actioncomm
2017-06-08 12:02:39 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Laurent Destailleur
a0295821ba
Fix errors in extra computed field
2017-06-07 11:38:42 +02:00
Laurent Destailleur
63920930bf
Merge branch 'develop' into 6.0-salary
2017-06-06 11:01:28 +02:00
Laurent Destailleur
22efbabfa6
NEW Add hook doUpgrade2
2017-06-06 01:34:25 +02:00
Laurent Destailleur
4e397107e1
Merge pull request #6934 from atm-florian/dev_loancalc
...
NEW : Add calculation function for Loan schedule
2017-06-03 01:10:39 +02:00
Laurent Destailleur
1761df2bc2
NEW Add page statistics for project tasks
2017-06-02 19:28:22 +02:00
florian HENRY
b0f2db7aaa
NEW : Add calculation function for Loan schedule
2017-06-02 17:48:29 +02:00
Laurent Destailleur
c59d216cf5
NEW Can read time spent of others (hierarchy only or all if granted)
2017-06-02 13:24:45 +02:00
Laurent Destailleur
5c58ed8ca7
Add a better error message when payment link is not valid.
2017-06-02 09:13:04 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Alexandre SPANGARO
dc9d9b47b4
Fix : Missing language key
2017-05-31 21:35:26 +02:00
Laurent Destailleur
c9a09adf79
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2017-05-31 12:50:29 +02:00
Laurent Destailleur
c39ca4cff8
NEW Introduce function dol_compress_dir
2017-05-31 00:20:35 +02:00
Laurent Destailleur
5d115bcf69
Fix deadlock feature, can't process a leave request when validator has
...
left company.
2017-05-30 20:58:32 +02:00
Laurent Destailleur
fa6bc03765
Fix typo
2017-05-30 01:34:20 +02:00
Laurent Destailleur
d56cd44ebc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-29 19:11:41 +02:00
Laurent Destailleur
7066ec7dab
NEW Can clone expense report on another user
2017-05-29 13:22:52 +02:00
Laurent Destailleur
395d361d66
Look and feel v6
2017-05-29 11:38:23 +02:00
Laurent Destailleur
30bc8b9a32
Fix typo
2017-05-29 11:00:36 +02:00
Laurent Destailleur
05a537dfb6
Merge pull request #6895 from grandoc/new_branch_25_05
...
New branch 25 05
2017-05-29 10:33:28 +02:00
Laurent Destailleur
c4f09b8894
Work on modulebuilder
2017-05-28 14:43:17 +02:00
Laurent Destailleur
c651f1da45
Work on modulebuilder tool
2017-05-27 19:05:36 +02:00
philippe grand
1f3a8b507e
missing translation
2017-05-25 22:02:57 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
c98f0ba457
Fix typo
2017-05-23 15:57:18 +02:00
Laurent Destailleur
2b9f654b8c
Fix translation
2017-05-22 15:31:05 +02:00
Laurent Destailleur
1a8884bbbe
NEW Can filter on year and product tags on the product statistic page
2017-05-22 15:20:52 +02:00
Laurent Destailleur
82560b9126
Look and feel v6
2017-05-22 10:58:20 +02:00
Laurent Destailleur
ba5fb700ba
Missing translation
2017-05-19 18:35:52 +02:00
Laurent Destailleur
d1c4439a0f
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
...
NEW Module Agenda: Add option - Show linked object into agenda view
2017-05-19 17:23:54 +02:00
Laurent Destailleur
330b9e7038
Merge pull request #6866 from absnc/project_element_shipping
...
NEW Enable shipments in Project overview tab
2017-05-19 17:10:51 +02:00
Laurent Destailleur
2a0a0f12f3
Merge pull request #6867 from OPEN-DSI/core_dict_actioncomm_modify_color_position
...
NEW Core dictionaries: Adds the ability to change the color and position …
2017-05-19 16:33:05 +02:00
Laurent Destailleur
4e7353f8a0
Clean code
2017-05-19 13:39:00 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
KHELIFA
2382a0a4ee
Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events'
2017-05-19 10:46:29 +02:00
absnc
7b784a1dcb
Enable shipments for project overview tab
2017-05-19 17:50:10 +11:00
Laurent Destailleur
f3838ee8f2
Fix limit into message
2017-05-17 18:52:01 +02:00
KHELIFA
169859b708
Module Agenda: Add option - Show linked object into agenda view
2017-05-17 17:00:45 +02:00
Laurent Destailleur
a8afa547f0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
2017-05-17 15:20:17 +02:00
Laurent Destailleur
d86b42b024
Missing title, bad css
2017-05-17 14:45:08 +02:00
Laurent Destailleur
9870cafea3
Better translation
2017-05-16 16:40:03 +02:00
Laurent Destailleur
ce84990414
NEW On invoices generated by template, we save if of source template.
2017-05-16 02:46:19 +02:00
Laurent Destailleur
789fbb6dc3
Enhance tooltips
2017-05-15 12:57:08 +02:00
Laurent Destailleur
caae7e4171
NEW It's easier to switch between sandbox and live for paypal
2017-05-14 17:05:13 +02:00
Laurent Destailleur
998254d9c6
Finish rewrite and debug of module Stripe.
2017-05-14 16:17:23 +02:00
Laurent Destailleur
9e4e72baee
Enhance module stripe
2017-05-14 05:26:19 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
f8403d5020
Fix phpunit test
2017-05-12 20:01:45 +02:00
Laurent Destailleur
f6dcb2860a
More complete help message
2017-05-12 19:14:54 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
74af1223de
Fix company id for US
2017-05-12 11:26:24 +02:00
Laurent Destailleur
b09300ab61
NEW Can edit background color for odd and even lines in tables
2017-05-11 13:02:29 +02:00
Laurent Destailleur
1c7d9b9d9a
Merge pull request #6804 from aspangaro/6.0-multijournal
...
New : Accountancy - Add a list to select the bank journal in bank card
2017-05-10 22:46:30 +02:00
Laurent Destailleur
578eb98b33
Better user interface
2017-05-10 13:13:33 +02:00
Laurent Destailleur
c4722e3694
FIX XSS
2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f
FIX XSS
2017-05-10 11:47:34 +02:00
Laurent Destailleur
1748f1d451
Better tooltip for computed field
2017-05-09 17:00:07 +02:00
Laurent Destailleur
9fe28c9b2c
NEW Can disable all overwrote translations in one click.
2017-05-09 10:08:04 +02:00
Laurent Destailleur
c26d24e97d
Work on module builder
2017-05-09 00:00:09 +02:00
Laurent Destailleur
dd71fdc82f
Work on modulebuilder template
2017-05-08 21:00:23 +02:00
Alexandre SPANGARO
b05d2c50e8
Add mode live
2017-05-08 06:52:30 +02:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Alexandre SPANGARO
dd97bbdc82
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-07 15:10:30 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Alexandre SPANGARO
7c4b47f20d
Update works
2017-05-06 08:33:12 +02:00
Laurent Destailleur
e8c60642e6
Translation fix
2017-05-06 03:21:47 +02:00
Laurent Destailleur
56140ae572
Work on default focus
2017-05-06 01:09:22 +02:00
Laurent Destailleur
885a636351
Debug new journal list page
2017-05-05 16:35:05 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
b7f7683e5a
Merge pull request #6774 from aspangaro/6.0-multijournal
...
Finish to move accountancy journals list to page like dictionnary
2017-05-05 14:21:55 +02:00
Laurent Destailleur
dfa81bc806
Merge pull request #6792 from aspangaro/6.0-agiris
...
New : Accountancy - Add export model towards Agiris
2017-05-05 14:15:51 +02:00
Laurent Destailleur
a1ac3b470b
Change menu for setup of predefined emails
2017-05-05 14:01:20 +02:00
Laurent Destailleur
65e03ca3ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 12:34:22 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
0a1ec514d2
Merge pull request #6772 from aspangaro/6.0-1
...
Add option on accounting account getNomUrl
2017-05-05 10:02:27 +02:00
Laurent Destailleur
f069ef9844
FIX #6767
2017-05-05 09:16:11 +02:00
Laurent Destailleur
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
2de335e2dc
Action must be a verb
2017-05-04 18:49:58 +02:00
Laurent Destailleur
7d5b5cf86a
Better behavior for tooltip on click
2017-05-04 13:09:42 +02:00
Laurent Destailleur
6fb8876e5a
Merge pull request #6730 from fappels/5.0_fix_en_US_admin_tag
...
Fix typo in en_US admin tag
2017-05-04 09:54:21 +02:00
Laurent Destailleur
3871da0324
Merge pull request #6729 from atm-florian/dev_importexport_ressources
...
NEW : Add module resources import/export
2017-05-04 09:43:00 +02:00
Alexandre SPANGARO
29bede28f0
New : Accountancy - Add export model towards Agiris
2017-05-04 06:49:29 +02:00
Alexandre SPANGARO
e58d2f428b
Merge remote-tracking branch 'uptream/develop' into 6.0-1
2017-05-01 20:31:08 +02:00
Laurent Destailleur
6e1f825190
Look and feel v6
2017-05-01 13:01:05 +02:00
Alexandre SPANGARO
cbd0598611
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-01 08:16:55 +02:00
Alexandre SPANGARO
6afd0d642a
Finish to move accountancy journals list to page like dictionnary
2017-05-01 08:16:09 +02:00
Alexandre SPANGARO
e11254a9bf
Add option on accounting account getNomUrl
2017-04-30 15:04:51 +02:00
Laurent Destailleur
7c2b3b8df0
NEW When down payment is entered, discount to reuse into final invoice
...
is automatically created. This save one click into invoice workflow.
2017-04-30 12:55:11 +02:00
Laurent Destailleur
60951cf307
Less data example
2017-04-30 04:09:50 +02:00
Laurent Destailleur
4993a43025
Move new feature inventory into module stock.
2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f
Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview
...
New inventory coreobject listview
2017-04-29 21:31:46 +02:00
Laurent Destailleur
04b1535b12
FIX Found duplicate line when it is not.
2017-04-29 14:59:40 +02:00
Laurent Destailleur
8ec44615cd
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:54:21 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
Laurent Destailleur
2e6d865c7d
NEW Can define default values for create forms.
...
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
2017-04-29 00:44:25 +02:00
phf
8219ff84c8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-04-28 14:45:04 +02:00
Laurent Destailleur
676ff84a4e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-28 14:05:42 +02:00
Laurent Destailleur
defce63a24
Work on management of default values
2017-04-28 14:05:28 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
0ba6433a61
Work on module website
2017-04-28 13:10:08 +02:00
Laurent Destailleur
853c8a8e07
Fix typo
2017-04-27 18:05:53 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
Laurent Destailleur
1758b83604
Clean explanation for accounting module setup.
2017-04-27 13:50:13 +02:00
Laurent Destailleur
9c2ce0202d
Translation
2017-04-27 13:19:36 +02:00
Laurent Destailleur
1a98c4a3ff
Fix error management in adding translation key
2017-04-27 12:48:13 +02:00
Laurent Destailleur
508109d5b1
Translation
2017-04-27 00:21:00 +02:00
Laurent Destailleur
84e774ff32
Better translation
2017-04-25 12:57:20 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
florian HENRY
10541e0c53
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_importexport_ressources
2017-04-19 14:48:06 +02:00
Laurent Destailleur
50210d0dd6
NEW Add tooltip help on shipment weight and volume calculation
2017-04-18 17:04:56 +02:00
fappels
433b9e6fe1
Fix typo in en_US admin tag
2017-04-18 16:22:39 +02:00
florian HENRY
a52db08cd6
NEW : Add module resources import/export
2017-04-18 15:25:04 +02:00
Laurent Destailleur
9456f7091e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-04-18 01:36:33 +02:00
Laurent Destailleur
82f9555c6b
Translation
2017-04-18 01:35:58 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-17 06:51:02 +02:00
Laurent Destailleur
e97e202deb
NEW Can import users
2017-04-17 04:22:53 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
b0442aa56a
Better explanation on label that are translated.
2017-04-14 19:48:01 +02:00
Laurent Destailleur
e6e9b65594
NEW Reduce memory usage by removing deprecated constant loading.
2017-04-14 12:38:52 +02:00
Laurent Destailleur
db23a5222b
Fix translation
2017-04-13 15:12:19 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
0417eb3862
Merge pull request #6686 from guillaume-uH57J9/develop
...
NEW Improve public member subscription form with member type
2017-04-11 11:31:25 +02:00
Laurent Destailleur
759315aef5
NEW Mass action delete available on project and tasks
2017-04-11 02:48:16 +02:00
Laurent Destailleur
d15792bdf4
Minor fix
2017-04-11 00:59:47 +02:00
Laurent Destailleur
06f9c1989b
Work on default values
2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6
Default value
2017-04-10 12:51:52 +02:00
Guillaume
f427c8441a
add translation strings for ForceMemberType
2017-04-09 22:49:48 +02:00
Laurent Destailleur
ddd101757e
FIX Bulk pdf merge on supplier proposals
2017-04-09 13:26:26 +02:00
Laurent Destailleur
76af83ce06
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-08 14:06:25 +02:00
Laurent Destailleur
7f7ba6279a
Fix translation
2017-04-08 14:02:07 +02:00
Laurent Destailleur
aa47575b13
Serious debug of variant module. No more fu.. js errors on smarpthone.
2017-04-07 12:31:08 +02:00
Laurent Destailleur
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f
FIX #6636 Complete fix
2017-04-06 21:55:23 +02:00
Laurent Destailleur
e2b96abd0b
Fix translation
2017-04-05 13:34:52 +02:00
Laurent Destailleur
9df4bac202
NEW Bookmarks are into a combo list.
2017-04-04 11:56:19 +02:00
Laurent Destailleur
4902df7e3f
Work on look and feel v6
2017-04-02 19:28:38 +02:00
Laurent Destailleur
cab944a1a1
Merge pull request #6602 from aspangaro/6.0-multijournal
...
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780
NEW Add "depends on" and "required by "into module informations
2017-03-30 15:54:48 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
ce7368d10e
Fix events create from member card not linked to member
2017-03-30 11:51:07 +02:00
Laurent Destailleur
78cc976e9f
Work on module builder
2017-03-30 10:40:15 +02:00
Laurent Destailleur
4df8dcf980
Work on module modBlockedLog and modModuleBuilder
2017-03-29 21:50:15 +02:00
Laurent Destailleur
e3d3d32b4a
Translation
2017-03-29 11:11:37 +02:00
Alexandre SPANGARO
06c2f04927
Finish work on multijournal admin part
...
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Laurent Destailleur
c84e20abaf
Fix translation
2017-03-28 21:05:11 +02:00
phf
df170769c9
Update function module inventory
2017-03-28 16:05:18 +02:00
Alexandre SPANGARO
fc2b9a858b
New : [FP17] Add multijournals in accountancy admin
2017-03-28 06:35:03 +02:00
Laurent Destailleur
219bcb0d54
Work on 6.0 features.
2017-03-27 22:44:50 +02:00
atm-ph
76b95aeec0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-25 19:15:25 +01:00
Laurent Destailleur
4012aeff90
Fix translation
2017-03-25 18:35:17 +01:00
Laurent Destailleur
106d19a8af
FIX #6468 + Fix missing translation
2017-03-25 03:53:11 +01:00
Laurent Destailleur
278bbf184c
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
...
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
atm-ph
edc2d39702
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-24 17:06:40 +01:00
Laurent Destailleur
3cc312d485
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2017-03-23 19:48:34 +01:00
Laurent Destailleur
6ab94ddbe7
Fix translation
2017-03-23 19:26:02 +01:00
Laurent Destailleur
c4b6378751
Fix english translation
2017-03-23 16:46:00 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
a5c11dc840
NEW Add function dolMd2Html
2017-03-21 16:03:13 +01:00
Laurent Destailleur
4457bc33cd
Fix english translation
2017-03-21 14:23:55 +01:00
Alexandre SPANGARO
b09398a68e
Update works
2017-03-19 15:23:35 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
504e1e1ec8
Step 3: Work on card
2017-03-19 07:26:15 +01:00
Laurent Destailleur
967f3f579d
Fix translation
2017-03-18 20:07:37 +01:00
Laurent Destailleur
597fb11d08
Fix error management in duplicate trigger
2017-03-18 11:36:48 +01:00
Laurent Destailleur
deb91ad7c1
FIX Data lost during merge of thirdparties
2017-03-15 13:30:30 +01:00
Laurent Destailleur
7f8c4d7d0f
Fix CSS
2017-03-14 14:33:25 +01:00
Laurent Destailleur
ec7d48931e
Merge duplicate menus/page on projects
2017-03-14 13:49:04 +01:00
Alexandre SPANGARO
c6c07bf9f4
New : Add project to social contributions
2017-03-12 14:32:49 +01:00
Laurent Destailleur
d1fe6a408c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-11 12:41:47 +01:00
Laurent Destailleur
9d63697d2a
Fix missing translation
2017-03-11 12:04:01 +01:00
Laurent Destailleur
9cbc5387ef
Fix text
2017-03-11 11:41:02 +01:00
Laurent Destailleur
0ff4f7e694
Fix translation
2017-03-11 03:10:57 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
c0b3219c72
Missing translation
2017-03-11 00:33:04 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
fda84995e8
If manage zero is set, we must NOT set length. So we can here make a
...
shortcut to avoid useless code.
2017-03-10 11:50:57 +01:00
Laurent Destailleur
6cd53cb471
Merge pull request #6482 from aspangaro/5.0-27
...
Fix : Language & revert a description of the function
2017-03-10 11:12:42 +01:00
Laurent Destailleur
c962daabac
NEW add property to show warnings when activating modules
2017-03-09 15:16:16 +01:00
Laurent Destailleur
d241adc201
NEW Use autocompletion on the "Add widget list".
2017-03-09 13:22:43 +01:00
Alexandre SPANGARO
6ce8aa7d6f
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-03-07 22:08:23 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
6c91cb4f90
Fix it was not possible to create/edit a new chart of account
2017-03-03 17:59:49 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
0a0797e797
Rename menu entry
2017-03-03 13:36:38 +01:00
Laurent Destailleur
807eb56807
Add BHD currency
2017-03-03 13:15:20 +01:00
Alexandre SPANGARO
19ce0b0d89
Fix : Language & revert a description of the function
2017-03-03 06:22:12 +01:00
Laurent Destailleur
d202003e29
Fix translation
2017-03-01 18:12:06 +01:00
Alexandre SPANGARO
05e50e1027
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-02-28 05:52:43 +01:00
Laurent Destailleur
4f24613de0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2017-02-27 01:19:03 +01:00
Laurent Destailleur
92acbbd8a8
Fix parameters
2017-02-27 00:22:11 +01:00
Laurent Destailleur
bf591f5f91
Work on module website
2017-02-24 21:13:40 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
3f3b82ed64
Merge pull request #6454 from atm-florian/dev_fix_unittrad
...
fix unit trad
2017-02-22 14:16:28 +01:00
Alexandre SPANGARO
942b58efaf
New : Integration of Stripe
2017-02-22 06:33:52 +01:00
Laurent Destailleur
d5bb208957
Clean admin menu entries
2017-02-22 02:19:50 +01:00
Laurent Destailleur
fc6fb61476
Minor fix in typo
2017-02-22 02:19:05 +01:00
florian HENRY
c8de648924
fix unit trad
2017-02-21 19:07:57 +01:00
Laurent Destailleur
ebe625aa16
Fix debug direct debit module
2017-02-21 13:16:28 +01:00
Laurent Destailleur
7ab600781d
NEW Move login information on home page into a widget
2017-02-21 11:57:52 +01:00
Laurent Destailleur
992f292a05
Translation
2017-02-21 10:59:49 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Laurent Destailleur
6c40110613
Sync transifex
2017-02-21 10:26:11 +01:00
Laurent Destailleur
68ded1b4c3
Fix language
2017-02-20 19:30:34 +01:00
Laurent Destailleur
3e2c0d26f2
Fix MVC
2017-02-20 11:59:58 +01:00
Laurent Destailleur
a8129ce46e
Fix transaction/sql error
2017-02-20 11:49:27 +01:00
Laurent Destailleur
89d10ae5aa
Fix the accounting account groups must be editable by book keeper, not
...
admin user.
2017-02-20 11:21:38 +01:00
Laurent Destailleur
501f118f92
Fix style
2017-02-19 22:53:29 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
arnaud
951ea51285
FIX translate model admin
2017-02-17 16:44:57 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
arnaud
fc0abe659a
NEW PDF with numbertoword
2017-02-17 16:39:36 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
0e6c329695
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-17 13:10:03 +01:00
Laurent Destailleur
a91d57037e
FIX #6433
2017-02-17 13:09:28 +01:00
Laurent Destailleur
bde6815e5d
Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error
...
Fix: [Multicurrency] properly display API error
2017-02-17 10:45:45 +01:00
Laurent Destailleur
498473715e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 01:48:43 +01:00
Laurent Destailleur
afa5ef2913
NEW Introduce fields that can be computed during export in export
...
profiles.
2017-02-17 00:19:28 +01:00
Laurent Destailleur
9778ca414a
Better translation
2017-02-17 00:07:02 +01:00
Raphaël Doursenaud
d9f32f7ae1
Fix: [Multicurrency] properly display API error
2017-02-15 13:20:38 +01:00
Laurent Destailleur
868f2e5473
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
Laurent Destailleur
ae740b7c1b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/langs/en_US/errors.lang
2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd
Fix control of module format.
2017-02-13 01:13:41 +01:00
Laurent Destailleur
05c9f57fd4
Move edition of emails templates out of dictionaries so we would be able
...
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
Laurent Destailleur
f34e0b1bdb
NEW Can deploy an external module from the module setup area.
2017-02-11 15:41:01 +01:00
Laurent Destailleur
4723eac227
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-11 13:56:39 +01:00
Laurent Destailleur
b9db7eba1b
Fix: deployement of a module
2017-02-10 19:14:58 +01:00
Laurent Destailleur
f6a8aacc8d
Fix: deployement of a module
2017-02-10 18:42:59 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
97eebe164c
Better translation
2017-02-10 17:09:56 +01:00
Laurent Destailleur
44ab6ad9b7
NEW Can control constants values into file integrity checker
2017-02-10 17:05:45 +01:00
Laurent Destailleur
66542b6367
Fix translation and link to direct debit payment
2017-02-10 10:43:54 +01:00
Laurent Destailleur
767e842c68
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-09 01:08:17 +01:00
Laurent Destailleur
ad361d6d45
Merge pull request #6394 from aspangaro/6.0-fiscalyear
...
[FP17] Accountancy - Prepare fiscal year
2017-02-08 19:25:02 +01:00
Laurent Destailleur
4d16540207
Merge pull request #6393 from aspangaro/6.0-export
...
NEW : [FP17] Accountancy - Add export of charts of accounts
2017-02-08 19:22:26 +01:00
Laurent Destailleur
596c092ec8
Merge pull request #6219 from atm-florian/dev_changelistchild
...
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
2017-02-08 16:49:18 +01:00
Laurent Destailleur
f4e64685e8
Merge pull request #6397 from apachler/develop
...
added additional payment terms often needed in Austria
2017-02-08 16:47:40 +01:00
Laurent Destailleur
6fef6ac2fb
Optimize code and performance of module variant
2017-02-08 14:07:54 +01:00
Andreas Pachler
ae3ace7e94
added additional payment terms often needed in Austria
2017-02-08 12:46:42 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Alexandre SPANGARO
4126dcff03
[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.
2017-02-08 06:51:42 +01:00
Alexandre SPANGARO
e4fc52497e
New : [FP17] Accountancy - Add export of charts of accounts
2017-02-08 06:18:56 +01:00
Laurent Destailleur
0a797cd12e
Fix us terms.
2017-02-07 20:08:15 +01:00
Laurent Destailleur
fbff32823a
Fix translation
2017-02-07 12:43:12 +01:00
Laurent Destailleur
b0ee04c079
FIX #6379
2017-02-07 01:13:50 +01:00
Laurent Destailleur
6b528b2bea
Fix translation: Open -> opened (open is for "mind/spirit", opened is
...
the adjective for a status)
2017-02-06 21:34:05 +01:00
Laurent Destailleur
fcbc12ce31
Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project
...
New link movement stock to project
2017-02-06 20:45:04 +01:00
Laurent Destailleur
a4bbcd866b
Merge pull request #6372 from atm-arnaud/NEW_supplier_paiements_report
...
NEW Add supplier paiements report
2017-02-06 20:29:42 +01:00
Laurent Destailleur
9220a638b5
NEW Filechecker can include custom dir and report added files.
2017-02-06 15:29:07 +01:00
Laurent Destailleur
6cb3199824
Translation message
2017-02-06 12:03:20 +01:00
Laurent Destailleur
f9c510f4fb
More complete translation
2017-02-04 11:34:29 +01:00
arnaud
6d3e43ddaf
NEW Report page and menu for suppliers paiements
2017-02-03 16:34:14 +01:00
Laurent Destailleur
e232a5a444
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-03 15:36:05 +01:00
Laurent Destailleur
5381eadc75
Fix translation
2017-02-03 15:33:44 +01:00
Laurent Destailleur
bd812a0bef
NEW new demo entry page
2017-02-03 14:48:16 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
cd6f5fb8cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:26:09 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
c657d193ec
Fix translation
2017-02-02 02:23:33 +01:00
Laurent Destailleur
4e43a815d1
Merge pull request #6359 from aspangaro/6.0-3
...
Fix : [FP17] Correct some problems on category accounting account page
2017-02-02 01:02:49 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
aspangaro
2ce4ba99fe
Fix : [FP17] Correct some fix on category accounting account page
2017-02-01 06:54:01 +01:00
Laurent Destailleur
fbf9986506
Fix translation
2017-01-31 18:03:25 +01:00
Laurent Destailleur
5e4509953d
Associated product must be on another export profile
2017-01-29 21:25:29 +01:00
Laurent Destailleur
756919de2a
Fix deadlock feature: could not solve a situation where an emailing was
...
validated by error.
2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb
Fix css and missing translation key
2017-01-29 15:07:18 +01:00
atm-ph
ccad6d6dde
New show on project "overview" tab the informations about movements stock
2017-01-29 13:36:33 +01:00
florian HENRY
cb6209de31
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_changelistchild
Conflicts:
htdocs/core/class/commonobject.class.php
2017-01-27 15:16:28 +01:00
Laurent Destailleur
9f1959ffc8
Fix MVC Actions must be done before output
2017-01-27 01:21:20 +01:00
Laurent Destailleur
105a53b333
Merge pull request #6333 from atm-quentin/Mass_withdrawal_request
...
NEW Mass withdrawal request
2017-01-27 00:55:16 +01:00
Laurent Destailleur
053afe21dd
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2017-01-26 23:40:16 +01:00
Laurent Destailleur
60ac751d84
Fix translation
2017-01-26 18:21:39 +01:00
Laurent Destailleur
c39fcce9f1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-26 10:45:38 +01:00
florian HENRY
13917cebdc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild
2017-01-25 11:02:23 +01:00
Quentin Vial-Gouteyron
6011c98515
FIX payment method exception
2017-01-24 12:22:23 +01:00
Quentin Vial-Gouteyron
39a92df647
Massive withdrawal request
2017-01-24 11:50:07 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
05582e9586
Sync transifex
2017-01-23 17:31:09 +01:00
florian HENRY
d714a52f95
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_changelistchild
Conflicts:
htdocs/core/class/commonobject.class.php
2017-01-23 11:35:11 +01:00
Laurent Destailleur
00ea5d3de0
Mising translation
2017-01-23 10:32:14 +01:00
Laurent Destailleur
b011d6e188
Fix date of invoice in future.
2017-01-22 23:00:40 +01:00
Laurent Destailleur
5fd8b1efcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 21:23:35 +01:00
Laurent Destailleur
db220e7af5
FIX Rename api_key into DOLAPIKEY to allow to use it on http header.
2017-01-22 20:55:26 +01:00
Laurent Destailleur
66819a34fa
Fix several bugs
2017-01-22 13:19:07 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
6ab9ba3284
Fix management of alternative language for Greek (el_CY)
2017-01-21 21:52:42 +01:00
Laurent Destailleur
31480a902b
Remove obsolete file
2017-01-21 21:12:01 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Juanjo Menent
2374aa351e
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-20 15:55:51 +01:00
