lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,659 Commits 43 Branches 150 Tags 886 MiB
12.0
Commit Graph

9885 Commits

Author SHA1 Message Date
Laurent Destailleur
a19fd8507e Trans 2019-09-28 13:47:51 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Laurent Destailleur
881c90ab74
Merge pull request #11953 from grandoc/new_branch_24_09_2019 
add missing translation
 2019-09-27 11:56:01 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
ba1275332d Fix thousand separator for fr_NC 2019-09-25 13:03:43 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Philippe GRAND
7ec43e8b59 add missing translation 2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +02:00
Laurent Destailleur
d22a1e2571 Use space 2019-09-23 19:44:05 +02:00
atm-quentin
80d5be56f6 Fix trans 2019-09-19 16:26:53 +02:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
Laurent Destailleur
ad3d21578c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-18 13:13:02 +02:00
Laurent Destailleur
2da5071642 Fix VAT in New caledonia is now called TGC 2019-09-18 13:12:22 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat 
NEW : copy linked categories on product clone process
 2019-09-15 16:34:42 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy 
NEW check if a resource is in use in an event
 2019-09-15 15:47:07 +02:00
Frédéric FRANCE
ff77d613fb
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-15 11:24:13 +02:00
Laurent Destailleur
6c078bdcb0 Fix translation 2019-09-15 10:53:41 +02:00
Laurent Destailleur
477c0e2aa4
Merge pull request #11897 from aspangaro/11.0_colorization 
NEW Bank Add an option for colorize background color of debit or credit movement
 2019-09-15 10:40:34 +02:00
Alexandre SPANGARO
21e27389d4 NEW Bank Add an option for colorize background color of debit or credit movement 2019-09-14 20:58:12 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 18:42:31 +02:00
Frédéric FRANCE
1e652a41af
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 18:41:51 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
3caa1bd43c FIX Debug feature orderstoinvoice for suppliers 2019-09-14 18:21:37 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 16:40:23 +02:00
Frédéric FRANCE
e5417cccd8
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:40:00 +02:00
Laurent Destailleur
4d1d689fc8
Merge pull request #11868 from bafbes/abb100077 
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
 2019-09-14 16:37:16 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75
add entity 2019-09-12 21:13:00 +02:00
Laurent Destailleur
a12bd6aec8 better translation 2019-09-12 18:55:07 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Abbes Bahfir
5183a1ec7a New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-11 22:45:52 +01:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
ATM john
337194023a Add purchase orders awaiting reception to workboard 2019-09-10 22:10:20 +02:00
ATM john
9db2e27289 add widget box for supplier orders awaiting reception 2019-09-10 21:47:08 +02:00
florian HENRY
ad92efaee1 add trans 2019-09-09 14:58:29 +02:00
florian HENRY
42cd15400d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:12:34 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
Laurent Destailleur
6d38d58000 Trans 2019-09-08 21:31:10 +02:00
Laurent Destailleur
44cb9738d6 Fix trans 2019-09-07 14:35:47 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus 
Differentiate supplier orders status
 2019-09-07 10:54:03 +02:00
Laurent Destailleur
89e1cdff61 Debug module datapolicy 2019-09-06 19:41:15 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists. 
FIX Confirmation of deletion
 2019-09-06 14:24:33 +02:00
Laurent Destailleur
57a15b88fa Fix UMR 2019-09-06 14:07:42 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
Laurent Destailleur
2e8c915b88 Fix more consistent setup 2019-09-06 02:39:08 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
 2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation
 2019-09-06 01:52:51 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Laurent Destailleur
50957ab621 Sync transifex 2019-09-05 16:51:20 +02:00
Laurent Destailleur
8e7f836534 Fix trans 2019-09-05 16:23:04 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
Christophe Battarel
1cfd5615d3 resolv conflict 2019-09-05 16:10:23 +02:00
VESSILLER
b70587c150 NEW check if a resource is in use in an event 2019-09-04 15:14:16 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
florian HENRY
73c5b9617f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-03 17:07:59 +02:00
Laurent Destailleur
bd47bd096b NEW Can defined a position of numbering submodules for thirdparties 2019-09-03 15:58:20 +02:00
Laurent Destailleur
2c02e4d118
Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list 2019-09-03 15:28:52 +02:00
Laurent Destailleur
a9bb891760
Merge pull request #11767 from aspangaro/11.0_digitaria 
NEW Digitaria model for numbering accountancy thirdparty
 2019-09-03 15:01:10 +02:00
Laurent Destailleur
95f3db1267 Fix translation 2019-09-03 14:41:39 +02:00
Florian Mortgat
c63a08b71b FIX: display a link to cron/list.php instead of just instructions on how to get there. 
Note: will have no impact until translations are updated; French & English updates provided
 2019-09-03 10:39:40 +02:00
Laurent Destailleur
c068177027 Work on search on global site files 2019-09-02 16:39:56 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
af6e25d928 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 12:37:58 +02:00
Laurent Destailleur
7e19a64ff2 Sync transifex 2019-08-31 02:17:50 +02:00
Christophe Battarel
8c8844d7ae Differentiate supplier orders status 2019-08-30 09:33:01 +02:00
Laurent Destailleur
8eae59945d Fix trans 2019-08-30 04:19:33 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
e54dbecf6d Sync transifex 2019-08-30 04:17:40 +02:00
Laurent Destailleur
6009601254 Use graph for stats on products/services 2019-08-30 04:15:24 +02:00
Laurent Destailleur
3b96271bd7 Add a warning to avoid headache 2019-08-30 02:21:34 +02:00
Laurent Destailleur
a8eb0e87a8 Translate 2019-08-29 02:11:46 +02:00
Laurent Destailleur
e421b4b698 Trans 2019-08-28 10:12:39 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Laurent Destailleur
12a09b8b2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2019-08-27 15:56:56 +02:00
Laurent Destailleur
1ac9affd82 Trans 2019-08-27 15:54:44 +02:00
Alexandre SPANGARO
958361b45e Merge branch 'develop' into 11.0_digitaria 2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45 NEW Digitaria model for numbering accountancy thirdparty 2019-08-27 14:03:33 +02:00
Laurent Destailleur
7009f036a0
Merge pull request #11744 from andreubisquerra/master 
Control errors before validate invoice in TakePOS
 2019-08-26 17:24:03 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
andreubisquerra
5d0dbea920 Control errors before validate invoice in TakePOS 2019-08-24 16:44:06 +02:00
Laurent Destailleur
1463302bdd Add option to disable the anonymous ping 2019-08-23 16:23:31 +02:00
Laurent Destailleur
775dd18b22
Merge pull request #11712 from andreubisquerra/master 
NEW Add 'Direct Cash Payment' button in TakePOS
 2019-08-22 11:22:57 +02:00
Laurent Destailleur
30266b00eb Trans 2019-08-22 01:25:25 +02:00
Laurent Destailleur
f5aede8256 NEW GeoIP v2 support is natively provided. 2019-08-21 19:38:45 +02:00
Laurent Destailleur
008bb16c7f Fix trans 2019-08-21 03:41:36 +02:00
andreubisquerra
f1b80fc19a Add 'Direct Cash Payment' button in TakePOS 2019-08-20 23:44:30 +02:00
Laurent Destailleur
bfe6f4a163 Fix RESTRICT_ON_API 2019-08-20 20:32:17 +02:00
Laurent Destailleur
fd3f890f7b NEW Can restrict access using DAV module to some host IPs only 2019-08-20 14:15:04 +02:00
Laurent Destailleur
65d11704bb Fix Protect DAV when $dolibarr_main_authentication is forceuser 
Compatibility with twoauth
 2019-08-20 13:46:15 +02:00
Laurent Destailleur
fb8e66a662 Trans 2019-08-19 18:34:54 +02:00
Laurent Destailleur
998c25f8d6 Translation 2019-08-19 17:08:58 +02:00
Laurent Destailleur
cc3fd0f1f6
Merge pull request #11679 from atm-john/develop_new_task_progress_bar 
FIX/NEW task widget and add task progress bar
 2019-08-19 10:05:16 +02:00
Laurent Destailleur
6abfd8b145 Fix use short labels for workboard 2019-08-19 10:01:42 +02:00
Laurent Destailleur
c989a63360 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/langs/en_US/cashdesk.lang
 2019-08-18 20:54:06 +02:00
Laurent Destailleur
cef88283b3 Fix missing error message 2019-08-18 20:52:18 +02:00
Laurent Destailleur
7e4cf224ec
Merge branch 'develop' into develop_new_task_progress_bar 2019-08-18 05:38:45 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
2147d505c3 NEW Can restrict API usage to some IP only 2019-08-17 21:44:37 +02:00
Laurent Destailleur
b99b49c542 Enhance website module 2019-08-17 17:39:31 +02:00
Laurent Destailleur
2510c1e5e4 Better help text 2019-08-16 03:05:55 +02:00
Laurent Destailleur
fa53641221
Merge pull request #11551 from atm-quentin/NEW_global_search_product 
NEW Add hidden option to set fields for the quick search on products
 2019-08-15 20:26:05 +02:00
Laurent Destailleur
56bc7b62ff
Update products.lang 2019-08-15 20:25:08 +02:00
Laurent Destailleur
a346b052e7 Enhance help 2019-08-15 18:37:57 +02:00
Laurent Destailleur
b5d72edebc Can add more samples of pages. Add an exemple of page with dynamic 
content.
 2019-08-15 18:07:36 +02:00
Laurent Destailleur
f81463af0c Update templates 2019-08-15 00:55:47 +02:00
Laurent Destailleur
b2f1cb22e8 Add tooltip in website module 2019-08-14 23:57:44 +02:00
Laurent Destailleur
2b805cc63d Add tooltip help in CSS edition 2019-08-14 23:47:01 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Laurent Destailleur
983dc80d9e FIX Disabling a website does not put it offline 2019-08-13 05:03:45 +02:00
Laurent Destailleur
7824731f17 NEW Add feature to search a string into containers 2019-08-13 00:34:42 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
Laurent Destailleur
de1af78ae6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 17:38:54 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Laurent Destailleur
86d39b435b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 02:42:11 +02:00
ATM john
f10f29f632 Add filters 2019-08-12 01:01:16 +02:00
ATM john
22c4a1b49e Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-11 09:57:13 +02:00
ATM john
09c1289802 Fix task widget and improve its display 2019-08-10 22:48:07 +02:00
ATM john
527e4dcf46 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar 2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Laurent Destailleur
9c92acadaa Fix lang 2019-08-10 01:51:50 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
John Botella
4aeaa580ea Add color blind option 2019-08-07 11:11:47 +02:00
John Botella
bc0508164b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-06 09:57:49 +02:00
Frédéric FRANCE
baa2e870d0
Update admin.lang 
found in admin/company.php
 2019-08-05 11:01:58 +02:00
Laurent Destailleur
b294f22285 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-04 13:07:09 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:57 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:18 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
John Botella
3992256046 add missing trans 2019-08-02 14:12:17 +02:00
John Botella
83d0f1f27f Add weather 2019-08-02 12:22:26 +02:00
atm-quentin
eca1029cd8 missing trans 2019-08-01 15:22:39 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
12b530c418 FIX Setup of TakePos was not possible after a clean install 2019-08-01 11:27:35 +02:00
Laurent Destailleur
814c405021 Add link to retry payment if error 2019-08-01 03:54:54 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
5cbde99871
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum 
NEW Can edit date or RUM mandate
 2019-07-30 16:04:57 +02:00
Laurent Destailleur
334e1a6737
Merge pull request #11583 from aspangaro/11.0_LDcompta 
NEW Accountancy Add export model LDCompta V9 & higher
 2019-07-30 15:59:43 +02:00
Maxime Kohlhaas
be6ad7b6a4 New : can define RUM date on third bank account 2019-07-28 17:10:37 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
atm-quentin
efd89588e5 fix trans 2019-07-25 12:21:28 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00
atm-quentin
5a385bf1cc ADD extrafields on global search 2019-07-24 09:41:02 +02:00
Laurent Destailleur
bf55733678 NEW Replace the "info" tab on contract with the more complete "agenda" 
tag.
 2019-07-23 02:45:31 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
f5afc50067 Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries 2019-07-22 18:47:35 +02:00
Laurent Destailleur
f0f0b989e9 FIX Add warning when setup is strange 2019-07-21 16:41:01 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
48b4aa4c8d Fix link to ticket 2019-07-19 18:29:33 +02:00
Alexandre SPANGARO
df73345046 NEW Accountancy Add export model LDCompta V9 & higher 2019-07-19 17:07:55 +02:00
Laurent Destailleur
1053a9d955 Trans 2019-07-19 16:49:12 +02:00
Laurent Destailleur
fea810fb3b Trans 2019-07-19 13:44:30 +02:00
Laurent Destailleur
14751680d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-19 13:38:05 +02:00
Laurent Destailleur
2e08c02510 Better error management 2019-07-19 13:37:28 +02:00
Laurent Destailleur
1f308915ee Fix trans 2019-07-19 13:23:17 +02:00
Laurent Destailleur
278c2d7152 Enhance the perf page 2019-07-19 12:58:21 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
c1df3ae5c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-18 11:10:18 +02:00
Laurent Destailleur
a23bae6c96 Work to mke the page perf.php public by default. 2019-07-18 11:10:09 +02:00
Laurent Destailleur
917799914e
Merge pull request #11433 from atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set
 2019-07-16 13:52:50 +03:00
Laurent Destailleur
6c23154a91 FIX #11506 2019-07-15 22:59:18 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
93d9f73f1d Trans 2019-07-05 17:44:31 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
c3715646e7 Missing trans 2019-07-04 21:29:27 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1 
Feature request: Extrafields - store computed value #11435
 2019-07-04 16:23:08 +02:00
Laurent Destailleur
f2c1568d09 NEW Extrafields separator can be collapsed or not 2019-07-04 15:43:05 +02:00
atm-florian.m
64d1ebf59c FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion. 2019-07-04 15:06:39 +02:00
Frans Bosman
f8a5ae90e3
Update admin.lang 2019-07-03 16:43:47 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
ad53289a19 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 20:13:51 +02:00
Laurent Destailleur
63284e0f24 Trans 2019-06-27 19:42:22 +02:00
Laurent Destailleur
c7db76f05a Trans 2019-06-27 19:38:53 +02:00
Laurent Destailleur
ab1f0aba93 Fix trans 2019-06-27 19:28:40 +02:00
Laurent Destailleur
6136dd6e7c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 13:57:08 +02:00
Laurent Destailleur
8c6485fa20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	ChangeLog
	htdocs/compta/facture/card.php
 2019-06-27 13:56:33 +02:00
Laurent Destailleur
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +02:00
Laurent Destailleur
244d21bd2b Fix trans 2019-06-27 00:45:17 +02:00
Laurent Destailleur
7c73004171 Fix trans 2019-06-26 13:14:16 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
70967b4ea1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd Fix purge of old files 2019-06-25 20:02:14 +02:00
Laurent Destailleur
27ad0d1f88 Trans 2019-06-25 16:35:25 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
Laurent Destailleur
604633afd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 18:45:15 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Laurent Destailleur
bf731e3de6 Fix trans 2019-06-24 16:30:55 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +02:00
Laurent Destailleur
9c54de57ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-23 18:12:56 +02:00
Laurent Destailleur
8866ab5565 Fix missing trans 2019-06-23 16:42:06 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
0f808114e5 Sync transifex 
Fix CSS for Left To Right Languages
 2019-06-22 13:18:33 +02:00
Laurent Destailleur
b111636ed0 Fix trans 2019-06-20 18:32:25 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
 2019-06-20 18:24:43 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
4ffa48d9bd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 13:50:47 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
e9da44e023 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:33:02 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other 
Translate rights
 2019-06-20 03:36:16 +02:00
Laurent Destailleur
e99cf13ccf
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column 
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
 2019-06-20 03:27:45 +02:00
Laurent Destailleur
382ec1a106
Merge pull request #11254 from andreubisquerra/master 
Basic phone layout for Restaurants in TakePOS
 2019-06-20 03:14:23 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2 
Missing language key
 2019-06-20 03:02:13 +02:00
Laurent Destailleur
7c4cddf28d Fix missing trad 2019-06-19 16:34:01 +02:00
Laurent Destailleur
5b5028254f Fix label 2019-06-19 16:30:03 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
ffbb14f40e Missing language key 2019-06-19 06:28:22 +02:00
Alexandre SPANGARO
13836d3e21 Missing language ley 2019-06-19 06:21:53 +02:00
Alexandre SPANGARO
f91c40a45c Translate rights 2019-06-19 06:00:11 +02:00
Alexandre SPANGARO
9234a54468 Translate rights 2019-06-19 05:49:23 +02:00
Alexandre SPANGARO
e1c476e744 Translate rights 2019-06-19 05:48:04 +02:00
Alexandre SPANGARO
42b03ec858 Translate rights 2019-06-18 22:53:50 +02:00
Alexandre SPANGARO
a0ae1e96a3 Translate rights 2019-06-18 22:52:37 +02:00
Alexandre SPANGARO
4de0a57f5c Translate rights 2019-06-18 22:44:43 +02:00
Alexandre SPANGARO
ce37544088 Translate rights 2019-06-18 22:41:18 +02:00
Alexandre SPANGARO
c59de49894 Translate rights 2019-06-18 22:38:52 +02:00
Frédéric FRANCE
a399e3f63d
Update companies.lang 2019-06-17 13:33:44 +02:00
Frédéric FRANCE
baf95c3c86
Update agenda.lang 2019-06-14 16:47:53 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Laurent Destailleur
e81663ec34 Fix cropping of image files for BOM module was ko 2019-06-12 19:00:34 +02:00
Laurent Destailleur
a7e0589071 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:22 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
aaed26b9b0
Update main.lang 2019-06-12 13:04:28 +02:00
Laurent Destailleur
32849db6d8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-12 12:10:07 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
Alexandre SPANGARO
c5ff0894be Accountancy : Fix language key 2019-06-10 22:10:49 +02:00
Alexandre SPANGARO
a0ab2fdfd7 Fix Missing language key 2019-06-09 08:29:44 +02:00
Alexandre SPANGARO
39fa4f9365 Fix Missing language key 2019-06-08 21:34:30 +02:00
Laurent Destailleur
1520ca9646 Fix buttons for payments 2019-06-07 13:51:53 +02:00
Laurent Destailleur
e3812e3b0c FIX source template invoice not loaded/shown 2019-06-05 08:20:10 +02:00
John BOTELLA
d7a393bbd3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-04 14:00:18 +02:00
Laurent Destailleur
ba2b07917b Fix look and feel v10 2019-06-04 02:11:03 +02:00
Laurent Destailleur
1415ad5b53 Debug website module 2019-06-02 17:27:00 +02:00
andreubisquerra
45fabede28 Basic phone layout for Restaurants in TakePOS 2019-05-26 16:44:17 +02:00
Laurent Destailleur
b5b5e1f6db More completepaybox integration with HMAC 2019-05-26 14:37:31 +02:00
Laurent Destailleur
410932f3f2 Trans 2019-05-26 12:01:08 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Laurent Destailleur
bca5a56db1
Merge pull request #11236 from a-schild/develop 
Add accountancy export option for Sage50 Swiss
 2019-05-24 12:52:51 +02:00
Laurent Destailleur
ceba186de8 Trans 2019-05-23 22:42:26 +02:00
Alexandre SPANGARO
2085958a69 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-23 11:10:07 +02:00
Alexandre SPANGARO
4ba8cf0641 Fix 2019-05-23 11:08:06 +02:00
Alexandre SPANGARO
d4384f507d WIP 2019-05-23 09:25:09 +02:00
Alexandre SPANGARO
65070afce4 WIP 2019-05-22 17:22:49 +02:00
a-schild
ab646450d6 Revert changes in DE/FR/IT languages, since they are generated/maintained via Transifex 2019-05-22 17:03:49 +02:00
Alexandre SPANGARO
a182b89bb0 Merge branch 'develop' into 10.0_closure2 2019-05-22 13:52:13 +02:00
a-schild
445a66ed21 Added sage50 swiss translation texts for EN/DE/FR/IT 2019-05-22 10:21:35 +02:00
Laurent Destailleur
2c0c1dbef3 Debug modulebuilder 2019-05-21 16:16:19 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Alexandre SPANGARO
d9e9cb2ea9 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-20 15:02:05 +02:00
ATM-Nicolas
d58603bd1e Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column 2019-05-20 09:13:37 +02:00
ATM-Nicolas
6be48e6952 NEW : Amount HT invoiced column in propal list 2019-05-20 08:59:44 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr 2019-05-19 21:12:22 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
Laurent Destailleur
b40eb92ce7 Mass action for closing members 2019-05-18 16:25:45 +02:00
Laurent Destailleur
bd1ed4f7ac
Merge branch 'develop' into 10.0_Differentiated_export 2019-05-16 21:26:20 +02:00
Laurent Destailleur
ced2c7383a
Merge pull request #11178 from aspangaro/10.0_openconcerto 
NEW Accountancy Add OpenConcerto export format
 2019-05-16 21:24:14 +02:00
Laurent Destailleur
53b7f3fe92
Merge pull request #11173 from aspangaro/10.0_accountancy_cat 
NEW Add accoutancy sell intra and export in product import
 2019-05-16 21:14:46 +02:00
Alexandre SPANGARO
f123f9951f NEW Add OpenConcerto export format 2019-05-15 12:16:03 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard 
invoices.
 2019-05-14 12:00:58 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Alexandre SPANGARO
d99424cdf0 NEW Add accoutancy sell intra and export in product import 2019-05-13 21:19:18 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
acc57343a9 Trans 2019-05-09 18:34:10 +02:00
Laurent Destailleur
78c4a3cced Fix lang 2019-05-09 18:33:50 +02:00
Laurent Destailleur
2ff81cd262 Fix duplicate key 2019-05-09 18:08:23 +02:00
Laurent Destailleur
a5b1de4f6a Fix tab that should not be visible 2019-05-09 17:52:55 +02:00
Laurent Destailleur
46b0545c4a Debug module reception 2019-05-09 17:26:06 +02:00
Laurent Destailleur
a94c291b76 Dolibarization 2019-05-09 16:59:06 +02:00
Laurent Destailleur
b8f2f957bf Sync transifex 2019-05-09 16:58:31 +02:00
Laurent Destailleur
2ffad20e9f fix typo 2019-05-09 16:37:46 +02:00
Laurent Destailleur
9672c7ccca Translation 2019-05-09 16:21:53 +02:00
Laurent Destailleur
84714f39e2 Fix setup of terminal 2019-05-09 13:37:20 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
ATM-Nicolas
77d3f22163 NEW : Amount invoiced column in propal list 2019-05-07 14:39:16 +02:00
Alexandre SPANGARO
4baffae297 Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-05-05 22:43:02 +02:00
Alexandre SPANGARO
4e16992796 WIP 2019-05-05 14:07:42 +02:00
Laurent Destailleur
60bf3452c3 Hide export in EEC for non european countries 2019-05-04 12:26:54 +02:00
Laurent Destailleur
3ad478c25e
Merge pull request #11109 from aspangaro/develop 
NEW Manage account sell_intra & sell_export in page accoutancy admin default product
 2019-05-04 12:18:23 +02:00
Laurent Léonard
476d15868c Fix civility translation in dutch dict language file 2019-05-04 06:25:53 +02:00
Alexandre SPANGARO
0359b1820a Merge remote-tracking branch 'upstream/develop' into develop 2019-05-03 14:10:57 +02:00
Alexandre SPANGARO
61547e3f82 NEW Manage account sell_intra & sell_export in page default product 2019-05-03 14:08:20 +02:00
Laurent Destailleur
dd4e70efe7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2019-05-03 12:14:17 +02:00
Laurent Destailleur
e694d0b2c2
Merge pull request #11101 from aspangaro/9.0_lettering 
FIX Massive debug in lettering function
 2019-05-03 11:39:45 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option 
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
 2019-05-02 21:54:28 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Alexandre SPANGARO
cbe23741eb FIX Massive debug in lettering function 2019-05-02 14:06:55 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master 
NEW Add history to view and print previous sales on TakePos.
 2019-05-02 14:04:57 +02:00
Laurent Destailleur
a75223c850 Debug ticket module 2019-05-02 13:53:13 +02:00
Laurent Destailleur
e81f10c790 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:45:49 +02:00
Laurent Destailleur
4a81e8fd62 Debug call to apilayer 2019-05-02 13:24:28 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
c12a16abea Fix trans 2019-04-30 02:49:13 +02:00
Laurent Destailleur
d55c440740 Fix some product and services export profiles 2019-04-29 21:23:01 +02:00
Laurent Destailleur
c7fcecc336 Fix email not loaded 2019-04-29 17:17:25 +02:00
andreubisquerra
00db274956 Add history to view and print previous sales. 2019-04-28 18:12:33 +02:00
Laurent Destailleur
0c432c28a8 Trans 2019-04-26 13:08:19 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
 2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
 2019-04-23 12:32:08 +02:00
Laurent Destailleur
09914f31f9 Trans 2019-04-23 12:14:50 +02:00
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