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
Laurent Destailleur
6780b20968
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43
Minor fixes
2017-01-20 14:10:57 +01:00
Laurent Destailleur
94249b7926
NEW Add statistics on tabs
2017-01-20 14:03:07 +01:00
Laurent Destailleur
b4733e043c
Fix tooltip when customer is closed
2017-01-20 12:17:10 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e
Fix position of field and tooltip
2017-01-20 12:08:33 +01:00
Laurent Destailleur
8ec1784e41
Better translation
2017-01-20 09:46:36 +01:00
Laurent Destailleur
49fc8129ac
NEW Can change customer from POS
2017-01-18 01:37:12 +01:00
Laurent Destailleur
86e690a064
Fix translation
2017-01-17 11:35:38 +01:00
Laurent Destailleur
c9ca35ebd1
Fix translation
2017-01-17 10:48:38 +01:00
Laurent Destailleur
ce37a855ce
Fix translation
2017-01-17 10:44:48 +01:00
Laurent Destailleur
41f6d70eaf
Merge pull request #6269 from defrance/patch-65
...
Fix: forgotten translation
2017-01-16 10:18:37 +01:00
Laurent Destailleur
0bac99028e
Merge pull request #6276 from aljawaid/develop
...
Fix: Add Missing Translation String
2017-01-16 00:43:00 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
IJ
d5120ae7cc
Fix: Add Missing Translation String
...
When product batch module is disabled, the translation string is missing for dispatch line.
2017-01-15 11:04:32 +00:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Juanjo Menent
6cc3ef0c99
NEW: Events notifications in browser
2017-01-13 16:08:49 +01:00
BENKE Charlie
6014314610
forgotten translation
...
translation lefted on last 5.RC version
2017-01-13 09:05:10 +01:00
Laurent Destailleur
f185a09693
FIX Security access problem with external users on projects/tasks
2017-01-12 15:26:00 +01:00
Laurent Destailleur
9671810d13
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-12 11:33:25 +01:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
Laurent Destailleur
0548e9cc4e
Merge pull request #6226 from aspangaro/5.0-19
...
NEW Expense report now send email on different validatin steps (Remove DEPLACEMENT_TO_CLEAN)
2017-01-12 11:15:14 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
3d8c5b377b
Fix string not translated
2017-01-12 10:16:19 +01:00
Alexis Algoud
8b4a43ec77
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-09 10:31:05 +01:00
Laurent Destailleur
8e615a83e5
Better tooltip
2017-01-08 01:07:28 +01:00
Laurent Destailleur
5446ff667a
Fix translation
2017-01-07 21:33:23 +01:00
Laurent Destailleur
f00f3101d9
Merge pull request #6013 from aljawaid/develop
...
NEW: Make Top Menu Entries Independent Translation Strings
2017-01-07 20:45:44 +01:00
Laurent Destailleur
4c4aeba855
Fix project on loans
2017-01-07 17:54:47 +01:00
Laurent Destailleur
358616cda2
Fix link should be https
2017-01-07 15:18:57 +01:00
Laurent Destailleur
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
Alexis Algoud
370be70e46
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-03 16:30:50 +01:00
Laurent Destailleur
c635baa848
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/langs/en_US/errors.lang
2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/en_US/errors.lang
2017-01-03 01:31:58 +01:00
Laurent Destailleur
064f38b89e
Fix condition to show time spent on project overview
2017-01-02 12:17:27 +01:00
Laurent Destailleur
b642a3a602
Prepare release 5.0
2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
aspangaro
4705a87548
Finish work
2016-12-27 14:48:14 +01:00
aspangaro
c21300f0fa
Expense report - Remove DEPLACEMENT_TO_CLEAN
2016-12-27 06:45:36 +01:00
Laurent Destailleur
c5850d29e7
Fix checksum integrity. Also add a global checksum.
2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9
Fix filecheck tool.
2016-12-26 19:01:24 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
635157be4c
Fix bad translation
2016-12-26 12:36:30 +01:00
Laurent Destailleur
c16489a3c0
Fix add message to explain why some emails fails
2016-12-25 23:14:51 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
florian HENRY
337897e0a1
NEW : Allow extrafields list select to be dependands on other standard
...
list and not only other extrafields list
2016-12-23 15:01:49 +01:00
Laurent Destailleur
f7e5898b4a
Fix show a more accurate translation
2016-12-20 10:58:31 +01:00
Laurent Destailleur
94eeaf9ed0
Fix typo error
2016-12-19 18:47:21 +01:00
abb
08846da2d3
new: Professional identifiers for Algeria
2016-12-18 20:05:56 +01:00
abb
10b231bd9d
new:identificateurs mprofessionnels pour l'algérie
2016-12-18 19:26:30 +01:00
Laurent Destailleur
9d3bd9d36f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-12-18 11:57:04 +01:00
Laurent Destailleur
394e284a4a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
htdocs/langs/en_US/errors.lang
2016-12-18 02:16:40 +01:00
Laurent Destailleur
9fd48df839
Fix minor bug on subscription pages
2016-12-17 19:21:48 +01:00
Laurent Destailleur
73e6663230
Fix help/messages for emailing to warn users.
2016-12-17 14:47:06 +01:00
Laurent Destailleur
c5db333af8
Fix translation of error message when sending email
2016-12-17 14:00:39 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/conf/conf.php.example
htdocs/langs/en_US/mails.lang
2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282
FIX Security to restrict email sending was not efficient
2016-12-16 13:46:39 +01:00
Alexis Algoud
4d375bcf95
debug translate
2016-12-16 11:31:14 +01:00
Alexis Algoud
e65ae08e5c
langs
2016-12-15 17:42:14 +01:00
Laurent Destailleur
d32fd7aa11
FIX javascript xss injection and a translation
2016-12-15 11:55:33 +01:00
Laurent Destailleur
9f0528f5f1
Complete work on dol_banner
2016-12-14 00:06:50 +01:00
Maxime Kohlhaas
04ed2df827
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option
...
# Conflicts:
# htdocs/imports/import.php
2016-12-11 16:20:46 +01:00
Laurent Destailleur
cdba7cfa1c
Clean api rest
2016-12-10 19:04:56 +01:00
Laurent Destailleur
facd0d9743
Merge pull request #6099 from atm-florian/dev_advtaremailng
...
NEW : Finnish Advance target emailing feature
2016-12-10 11:55:05 +01:00
Laurent Destailleur
7ec4bc055a
Sync transifex
2016-12-10 11:51:55 +01:00
florian HENRY
3b25bf2ee6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng
2016-12-10 11:37:07 +01:00
Laurent Destailleur
aac44d5797
Add cambodgian files
2016-12-10 10:25:02 +01:00
Laurent Destailleur
5353aa6efe
Better error management when creating bookkeepin entries
2016-12-10 02:38:07 +01:00
florian HENRY
a0e8b509db
Finish Advance target emailing feature (back from hashes since 3.7)
2016-12-09 19:06:59 +01:00
Laurent Destailleur
d5e417010f
Complete work on dol_banner
2016-12-09 11:16:04 +01:00
Laurent Destailleur
9efcda6714
Merge pull request #6086 from fappels/develop-work-on-warehouse-status
...
New continue work on warehouse status #5115
2016-12-07 13:06:07 +01:00
Laurent Destailleur
6b5ce5c699
Merge pull request #6084 from milamberspace/Fix_ICE_Maroc
...
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
2016-12-07 12:00:03 +01:00
fappels
085d44eaba
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-06 20:15:45 +01:00
Laurent Destailleur
2a8f23e8c5
Fix labels
2016-12-06 15:03:39 +01:00
fappels
c911f906c8
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-05 11:36:20 +01:00
Milamber
e4006602f3
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc)
...
Fix issue in pdf.lib.php to add the Prof ID 5 and 6
Ref: http://www.ice.gov.ma/ICE/
2016-12-05 08:04:34 +00:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +01:00
Laurent Destailleur
2b8fbf200a
Complete work on the new dol_banner
2016-12-03 21:29:49 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
fappels
a7a20f45a1
Remove Only shipping and dispatch status
...
Remove Only shipping and dispatch status, better to create new future
option 'Routing' for this.
2016-12-02 11:03:21 +01:00
Laurent Destailleur
d86c3931e2
Fix translation
2016-11-30 09:09:09 +01:00
Laurent Destailleur
f267273251
Missing translation
2016-11-29 10:38:27 +01:00
Laurent Destailleur
83972b39ce
Complete work on dol_banner. Fix errors due to missing columns.
2016-11-28 23:58:36 +01:00
Laurent Destailleur
4eb397557f
Debug accounting module
2016-11-28 19:30:55 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
Laurent Destailleur
b2ed3f3053
Fix translation
2016-11-28 16:32:14 +01:00
Laurent Destailleur
5e5ce0043e
Debug module ECM.
2016-11-28 12:03:33 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
017b18d5c6
Fix #6037 #6041
2016-11-27 16:09:16 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
a8c3ce4e55
FIX A form should not be inside a table. Create javascript troubles.
2016-11-26 12:21:50 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
gauthier
480b08bd0b
NEW : convert exceiss received to reduc
2016-11-24 15:48:04 +01:00
Laurent Destailleur
dea2ab06f5
Fix missing translation
2016-11-23 12:31:35 +01:00
Laurent Destailleur
c1628be9c0
Code comment to add some explanations
2016-11-23 12:29:42 +01:00
Laurent Destailleur
15468d88a0
FIX #6007
2016-11-22 20:36:01 +01:00
Laurent Destailleur
94607d3dea
FIX #6007
2016-11-22 20:35:51 +01:00
aspangaro
638563dc5d
Fix missing language key in holiday type dictionary
2016-11-22 05:54:44 +01:00
aspangaro
38a31cbd28
Fix missing key language in dictionary email models
2016-11-22 05:25:08 +01:00
IJ
b631db1d60
New: Add Hidden Options Quick Reference Link
...
Add the dolibarr wiki link for quick reference from the page Setup>Other Setup
2016-11-22 02:29:25 +00:00
aspangaro
213e7d1cd7
Fix Missing language key for dictionary format card
2016-11-21 21:49:08 +01:00
aspangaro
356b76d588
Fix missing language key
2016-11-20 22:35:26 +01:00
Laurent Destailleur
1c17335d34
FIX Move translation key in correct file
2016-11-20 18:19:39 +01:00
Laurent Destailleur
ff4fa9977c
FIX #5895
2016-11-20 15:47:05 +01:00
IJ
66693c5268
Update products.lang
2016-11-19 22:42:03 +00:00
IJ
9bb60e8d2c
Update agenda.lang
2016-11-19 22:41:35 +00:00
IJ
5a8b844c49
Update other.lang
2016-11-19 22:41:08 +00:00
IJ
d5fe7b8b9c
Add Search Tip for User
...
Add a simple tip on the search strings which could be used by the end user when they are searching from the main search box.
Tested strings are '*' and *|*
This would be very useful to the end user and new users
2016-11-19 12:21:47 +00:00
IJ
6ebafe1a87
Add Translation String for Agenda
...
Add translation string so it can be used independently for the top menu
2016-11-19 11:32:28 +00:00
IJ
5c46095fa3
Add Translation String for Tools
...
Add translation string so it can be used independently for the top menu
2016-11-19 10:52:30 +00:00
IJ
f96fd895e3
Add Products/Services Menu Translation String
...
Add the translation string into language file
2016-11-19 10:40:45 +00:00
Laurent Destailleur
e9b78db1ac
Several bug fixes:
...
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
2016-11-19 02:16:12 +01:00
Laurent Destailleur
5816c86e07
Debug accountancy module
2016-11-17 17:51:10 +01:00
Laurent Destailleur
7197b6ce0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-11-15 12:00:35 +01:00
Laurent Destailleur
06865b65e9
Debug accountancy module
2016-11-15 11:59:16 +01:00
Laurent Destailleur
598748b4db
Merge pull request #5988 from aljawaid/develop
...
Add PayPal Missing Translation String
2016-11-14 21:49:33 +01:00
Laurent Destailleur
bfd1ce0095
Fix translation
2016-11-14 15:25:45 +01:00
Laurent Destailleur
62e0d4ec3f
FIX Several problems into shipment management with lot enabled
2016-11-14 14:34:15 +01:00
Laurent Destailleur
cc70b51ba3
Fix missing warning
2016-11-14 02:25:59 +01:00
Laurent Destailleur
381b77850c
Fix do not show cloning of virtual product if option is off
2016-11-14 02:08:41 +01:00
Laurent Destailleur
a369514e46
Tooltip help better
2016-11-13 20:43:34 +01:00
Maxime Kohlhaas
5f704fe5e5
Import update, new way of working with a select
2016-11-13 09:03:34 +01:00
IJ
1d2d21de09
Add PayPal Missing Translation String
...
Add PayPal missing translation string to expense report payment type
2016-11-13 00:36:24 +00:00
Laurent Destailleur
7cf4703b73
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-11-12 22:52:48 +01:00
Laurent Destailleur
63162c1bac
Merge branch 'develop' of https://github.com/aljawaid/dolibarr into
...
aljawaid-develop
Conflicts:
htdocs/langs/en_US/agenda.lang
htdocs/langs/en_US/bills.lang
2016-11-12 22:51:31 +01:00
IJ
c2f1826ac9
Add status
2016-11-12 21:36:47 +00:00
IJ
fd63c91a18
Add Missing Translation String - Expense Report
...
Add Debit/Credit Card (text) to Expense Report payment type form fields when used.
2016-11-12 21:00:21 +00:00
Laurent Destailleur
348e004da6
Minor fixes in css
2016-11-12 16:39:08 +01:00
aspangaro
8909b4111d
Add options on getNomUrl
2016-11-12 10:41:57 +01:00
Maxime Kohlhaas
d18adc1231
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-11-12 09:02:35 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/filemanagerdol/connectors/php/config.php
htdocs/viewimage.php
2016-11-11 15:03:05 +01:00
aspangaro
c65678d00a
Update cactus numbering model
2016-11-11 07:36:26 +01:00
Laurent Destailleur
e4c4ced5a3
Complete work on usin dol_banner
2016-11-11 01:55:53 +01:00
Laurent Destailleur
eaa2125373
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/class/project.class.php
htdocs/projet/list.php
2016-11-10 11:40:39 +01:00
Laurent Destailleur
9fd5ddf807
NEW Add REST API for projects
2016-11-09 22:54:51 +01:00
philazerty
24c12df356
Update companies.lang
...
Ajout du Gabon
2016-11-09 12:16:41 +01:00
Laurent Destailleur
c45c24f80c
FIX Must use external link into a forged email content.
2016-11-08 23:18:43 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
Laurent Destailleur
7a94cfc994
NEW Better filtering of automatic/manually inserted events.
2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
5fb8ba8ee7
Better help to explain suggested account
2016-11-07 11:42:20 +01:00
Laurent Destailleur
84ed82bb08
Better error message
2016-11-07 00:20:30 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
Laurent Destailleur
69a6646433
Sync transifex
2016-11-06 12:51:37 +01:00
Laurent Destailleur
55e367742a
Sync transyfex
2016-11-06 12:50:32 +01:00
Maxime Kohlhaas
e5418a7624
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-11-06 11:36:08 +01:00
Laurent Destailleur
ebe3ed9ad4
Uniformize code
2016-11-04 17:48:20 +01:00
Laurent Destailleur
e59c2bb61c
Debug accounting menu. Can now edit product account if already set.
2016-11-04 16:15:31 +01:00
Laurent Destailleur
6ceb79cf5a
Uniformise look and feel
2016-11-03 20:55:55 +01:00
Laurent Destailleur
59291be6e0
NEW Can filter on status on objects on the "statistics" page.
2016-11-03 19:50:04 +01:00
Laurent Destailleur
6661773a06
Clean menu
2016-11-03 16:40:55 +01:00
Laurent Destailleur
3fbba59f69
Better management of status of events
2016-10-30 13:12:35 +01:00
Laurent Destailleur
03b882d095
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-10-29 18:44:55 +02:00
Laurent Destailleur
c858c5b39b
Merge pull request #5941 from simnandez/develop
...
Fix bad sql query introduced by #38e6c9c
2016-10-29 17:50:10 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Juanjo Menent
430312ab39
Sync transifex ready to use
2016-10-29 16:15:29 +02:00
Laurent Destailleur
5654a4609e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-10-28 12:00:46 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Juanjo Menent
a59cf0e13b
Merge pull request #5935 from aspangaro/5.0-p32
...
Accountancy - Add binding and journal for expense reports
2016-10-28 11:25:21 +02:00
aspangaro
029fa1ed8a
Finishing works
2016-10-27 06:04:23 +02:00
Laurent Destailleur
54bd355800
Better help
2016-10-27 02:02:40 +02:00
Laurent Destailleur
d27ffd4194
Merge pull request #5393 from frederic34/patch-10
...
NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order
2016-10-26 11:48:02 +02:00
Laurent Destailleur
d47fc281b0
Better accountancy tutorial
2016-10-26 11:15:25 +02:00
Laurent Destailleur
75695fafa6
Merge pull request #5917 from aspangaro/5.0-p31
...
Accountancy - Add menu expense report accounts in configuration
2016-10-26 11:03:00 +02:00
Laurent Destailleur
27808b7f81
Merge pull request #5915 from aspangaro/5.0-p29
...
NEW Expense report documents are now available in ECM module
2016-10-26 10:57:23 +02:00
Laurent Destailleur
11c4f49a15
FIX #5924
2016-10-26 10:42:34 +02:00
aspangaro
8800bf8b25
Update works
2016-10-26 07:46:48 +02:00
aspangaro
883446c5bb
Merge remote-tracking branch 'Upstream/develop' into 5.0-p32
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2016-10-25 22:09:40 +02:00
aspangaro
6e7f104c5f
Update works
2016-10-25 07:41:01 +02:00
Laurent Destailleur
b15535c1f1
Uniformize code
2016-10-25 02:04:46 +02:00
IJ
dcd11f0c71
FIX: Missing Supplier Order Translation String
2016-10-24 23:20:24 +01:00
Sergio Sanchis Climent
2a4517e1bc
FIX : #5907
2016-10-24 19:21:41 +02:00
Laurent Destailleur
f1421a2ee4
Rename constant with english name
2016-10-24 13:10:35 +02:00
Laurent Destailleur
8222f7a78b
Fix translation
2016-10-24 12:24:46 +02:00
aspangaro
0d62148a0f
Accountancy - Add menu expense report accounts in configuration
2016-10-24 06:27:20 +02:00
aspangaro
d0544b0aea
Merge remote-tracking branch 'Upstream/develop' into 5.0-p29
2016-10-24 05:27:49 +02:00
aspangaro
337e9db046
New: Expense report documents are now available in ECM module
2016-10-24 05:26:19 +02:00
Laurent Destailleur
fdcc858008
Merge branch 'dev_resource_extrafields' of
...
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 02:05:34 +02:00
Laurent Destailleur
3c3c5d06a1
Merge branch 'NEW_parent_warehouse' of
...
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 00:58:02 +02:00
Laurent Destailleur
0b63f89e3a
Merge branch 'NEW_customerorders_to_bill' of
...
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_customerorders_to_bill
Conflicts:
htdocs/langs/en_US/bills.lang
2016-10-24 00:44:37 +02:00
Laurent Destailleur
ab3cdfa16d
Clean code
2016-10-24 00:33:39 +02:00
Laurent Destailleur
60ba6164e4
Merge pull request #5883 from aspangaro/5.0-p22
...
Accountancy - Add loan module in step to configure the accountancy
2016-10-24 00:17:09 +02:00
Laurent Destailleur
534202ad45
NEW Can make reconcile directly from bank entry list
2016-10-23 23:13:03 +02:00
Laurent Destailleur
b8c9e95281
Fix translation
2016-10-22 19:14:31 +02:00
Laurent Destailleur
14e78ef50b
Mutualize code of 2 lists into one page.
2016-10-22 13:52:43 +02:00
Laurent Destailleur
f0365e49e2
Fix book keeper can edit accounting account of taxes
2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97
Debug module accounting
2016-10-21 17:41:05 +02:00
Laurent Destailleur
f93bca9be9
NEW Can see/make bank conciliation from transaction list
2016-10-21 17:00:31 +02:00
Laurent Destailleur
d18097da28
Prepare database to manage different vat rate with same rate value.
2016-10-21 14:09:11 +02:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +02:00
Laurent Destailleur
bb6177e72f
Better text
2016-10-18 12:44:27 +02:00
Laurent Destailleur
dada679110
Uniformise code
2016-10-18 12:16:12 +02:00
Laurent Destailleur
d1f9f3fd42
Better translation
2016-10-17 15:22:34 +02:00
Laurent Destailleur
28933c31dd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
2016-10-16 19:04:33 +02:00
aspangaro
53c8649629
Merge remote-tracking branch 'Upstream/develop' into 5.0-p22
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2016-10-16 13:44:09 +02:00
aspangaro
1af1e4dc9c
Accountancy - Add loan module in step to configure the accountancy
2016-10-16 13:38:29 +02:00
Laurent Destailleur
ee1ee1eee7
Management of the "Copy of" when cloning projects.
2016-10-16 12:12:45 +02:00
aspangaro
9ab0bfe905
Fix: Add another key for bank rather than to modify one
2016-10-16 06:50:13 +02:00
Laurent Destailleur
6601c9ef1b
Sync transifex
2016-10-15 16:51:02 +02:00
Laurent Destailleur
9cad437d5c
Fix list in chart of account
2016-10-15 16:20:08 +02:00
Laurent Destailleur
04c0e87d79
Work on accounting module
2016-10-15 15:51:28 +02:00
Laurent Destailleur
c689248211
The setup that must be done by the bookkeeper is removed from admin
...
setup and move into setup of accountancy
2016-10-15 14:38:43 +02:00
aspangaro
49e2b1ffdb
Fix: Error with language key
2016-10-15 06:56:38 +02:00
Laurent Destailleur
48ce299a38
NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities.
2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
5e00fb8fc7
Fix sepa mandate translation
2016-10-14 17:56:22 +02:00
Laurent Destailleur
a54a610a05
Uniformize code
2016-10-14 17:44:41 +02:00
Laurent Destailleur
a7c6ecc177
Fix better compatibility with multicompany
2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f
Debug accountancy module
2016-10-14 15:44:33 +02:00
Laurent Destailleur
79d376ee12
Debug accountancy module
2016-10-14 13:05:01 +02:00
gauthier
012be8e400
NEW : security check to avoid adding a parent warehouse chich is already a child of current one
2016-10-14 12:42:42 +02:00
gauthier
416311a7b9
NEW : allow to save a parent warehouse
...
# Conflicts:
# htdocs/product/stock/card.php
2016-10-14 11:29:14 +02:00
Laurent Destailleur
7c1b74133a
Debug accountancy module
2016-10-13 22:29:49 +02:00
Laurent Destailleur
78e8ab64aa
Debug multicurrency
2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
aspangaro
0b08db16a1
Fix: Missing language key
2016-10-13 06:31:09 +02:00
Laurent Destailleur
fbd57eb248
Fix missing %s
2016-10-11 15:30:57 +02:00
Laurent Destailleur
6b198e06b5
Fix english
2016-10-11 15:24:10 +02:00
Laurent Destailleur
92423be43d
Fix english
2016-10-11 15:03:56 +02:00
Laurent Destailleur
d0eb636051
Fix records is always singular
2016-10-11 14:50:32 +02:00
Laurent Destailleur
a5caced878
Fix translation
2016-10-11 13:48:27 +02:00
Laurent Destailleur
e7a09c07f9
Sync and clean language files
2016-10-11 10:38:38 +02:00
Laurent Destailleur
b903e1e5aa
Update lang
2016-10-10 20:59:23 +02:00
Laurent Destailleur
b92fb9ebfd
Fix orto
2016-10-10 20:12:28 +02:00
Laurent Destailleur
269b9ea2ea
Fix translation thirdparty -> third party
2016-10-10 15:15:54 +02:00
Laurent Destailleur
3329da1c8d
Fix translation
2016-10-10 14:42:21 +02:00
Laurent Destailleur
710e12420f
Use correct picto for lot
2016-10-10 02:01:30 +02:00
Laurent Destailleur
e11d9d7e4c
Reduce translation keys
2016-10-10 00:31:26 +02:00
Laurent Destailleur
89d08eadce
Better explanation of option
2016-10-09 20:35:24 +02:00
Laurent Destailleur
74f2a4d597
Enable feature to check online signature
2016-10-09 20:20:24 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +02:00
gauthier
5803087d4f
NEW : concat of all invoice pdf if invoice validation
2016-10-07 14:32:27 +02:00
Laurent Destailleur
03876ba637
Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right
...
NEW : Reopen a paid bill is a user right
2016-10-07 13:31:10 +02:00
Laurent Destailleur
6489cd6164
Debug accounting module
2016-10-07 12:10:16 +02:00
gauthier
fbd06e48cd
NEW : classify billed orders and trads
2016-10-07 09:20:34 +02:00
Laurent Destailleur
77e87b3c07
NEW Add tooltip in payment term edition in dictionnary
2016-10-07 00:37:06 +02:00
Laurent Destailleur
c908af6758
Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
...
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Laurent Destailleur
28e4c17730
Debug module accountancy expert
2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7
Complete help
2016-10-06 19:03:40 +02:00
Laurent Destailleur
539ee1ace2
Uniformize code
2016-10-06 18:06:40 +02:00
Laurent Destailleur
93c848fcc5
Add page index for accountancy module
2016-10-06 17:43:10 +02:00
Laurent Destailleur
c982409c72
Fix a deadlock feature
2016-10-06 15:29:10 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Laurent Destailleur
9ad96c2be3
Debug module accountancy expert
2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9
Better terminology
2016-10-05 18:31:55 +02:00
Laurent Destailleur
5a8a0fb79a
Debug
2016-10-04 21:33:47 +02:00
Laurent Destailleur
efaf1210c2
Uniformize look and feel
2016-10-04 20:28:58 +02:00
gauthier
b35a4eb1b2
Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month
2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1
NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month
2016-10-04 15:45:23 +02:00
Laurent Destailleur
a99e18865b
FIX Missing translation for ProjectCreatedInDolibarr
2016-10-04 13:02:05 +02:00
Maxime Kohlhaas
51d5de2e22
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-10-03 01:07:04 +02:00
aspangaro
7194e3b8dd
Merge remote-tracking branch 'Upstream/develop' into 5.0-credit_note
2016-10-02 21:40:30 +02:00
aspangaro
a328e673a3
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-02 21:39:24 +02:00
Maxime Kohlhaas
578cab9a70
Error management + show nb insert/update + langs
2016-10-02 19:14:28 +02:00
Laurent Destailleur
f92ca518f7
Uniformize look and feel
2016-10-02 16:38:58 +02:00
Laurent Destailleur
3efa0e411d
NEW Add a direct debit mandate PDF template.
2016-10-02 15:29:43 +02:00
Laurent Destailleur
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +02:00
Laurent Destailleur
e3aa84ff5a
NEW Add last activation date as info in module list.
2016-10-02 10:41:22 +02:00
Laurent Destailleur
2668cb20cc
Work on SEPA mandate
2016-10-01 20:45:50 +02:00
Laurent Destailleur
c9792ff047
Fix translation
2016-10-01 20:12:00 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
aae4524fe2
Debug module accountancy
2016-09-30 18:38:48 +02:00
Laurent Destailleur
20ad359c9b
FIX Warning to grant permission must be visible only if one module add
...
some permissions
2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8
Merge branch 'new_no_default_rights' of
...
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights
Conflicts:
htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
504ee9c73e
NEW Add system tool "Files integrity checker" to detect modified files
...
for packaged versions.
2016-09-30 12:01:06 +02:00
Laurent Destailleur
e6503c0d36
Better explanation
2016-09-29 12:52:28 +02:00
Laurent Destailleur
9e5ae87ee2
Trans
2016-09-28 23:44:58 +02:00
Laurent Destailleur
64d125b61f
Translation
2016-09-28 20:14:44 +02:00
Laurent Destailleur
e99f115a8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/tables/llx_user.sql
2016-09-28 19:49:36 +02:00
arnaud
c904b8030c
Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD
...
Conflicts:
htdocs/langs/en_US/users.lang
2016-09-27 15:25:29 +02:00
arnaud
b717d530cd
NEW User date of employment added
2016-09-27 15:16:16 +02:00
Laurent Destailleur
586b223221
Work on remote integrity checker
2016-09-26 15:24:43 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
1642d7c23b
Trans
2016-09-22 18:48:17 +02:00
gauthier
7ad2fda289
NEW : Reopen a paid bill is a user right
2016-09-22 15:06:39 +02:00
gauthier
6034b21746
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse
2016-09-21 12:17:38 +02:00
Laurent Destailleur
79ddc2458d
Better center of left, center and right part of titles.
2016-09-20 12:51:09 +02:00
gauthier
d508d44fef
NEW : migration script from 4.0.0 to 5.0.0 and langs
2016-09-20 12:10:25 +02:00
gauthier
a0ec91cb94
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse
2016-09-20 12:03:55 +02:00
gauthier
a4d0eed503
NEW : Save product stock warehouse in database and display list
2016-09-19 17:33:29 +02:00
Laurent Destailleur
d1c4f02bf7
Uniformize code and style
2016-09-18 14:41:17 +02:00
gauthier
7a0577ccfc
NEW : add limit stock product by warehouse
2016-09-16 17:09:38 +02:00
Laurent Destailleur
22df7d7a68
Work on module website
2016-09-14 23:42:17 +02:00
Laurent Destailleur
4228a51f18
Work on module website
2016-09-14 23:23:22 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
c71fc18942
NEW Checkbox 'close order to "Everything received" automatically if all
...
products are received' is visible on supplier orders.
2016-09-12 01:05:45 +02:00
Laurent Destailleur
1522d6060d
Fix some translation
2016-09-11 22:54:23 +02:00
Laurent Destailleur
ce137e3987
Fix migration when field was added without null flag.
2016-09-10 17:58:13 +02:00
Laurent Destailleur
66cf9e333e
Fix option MAIN_BUTTON_HIDE_UNAUTHORIZED
2016-09-10 02:58:46 +02:00
Laurent Destailleur
0079a3a9c5
A better explanation on choice on thirdparty creation process
2016-09-09 18:41:42 +02:00
Laurent Destailleur
5c5a6ce8b3
Fix bad merge
2016-09-09 18:24:51 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
417b2f566f
FIX Translation of "Name" is not a good choice for floow-up.
2016-09-08 17:31:42 +02:00
Laurent Destailleur
99a3cc6efc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:47 +02:00
Laurent Destailleur
6d6eceb0ca
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:38 +02:00
Juanjo Menent
729458ecf8
Merge pull request #5709 from atm-florian/dev_workflow_classDeliverOrderIfShippedTotally
...
NEW : workflow class deliver order if shipped totally on shipping validation
2016-09-07 17:10:14 +02:00
Juanjo Menent
73865fa14a
Merge pull request #5707 from aspangaro/5.0-p12
...
Fix Presentation of fiscal year
2016-09-07 17:06:58 +02:00
florian HENRY
d6be1cebcb
work on going
2016-09-07 12:41:32 +02:00
Laurent Destailleur
5fdca121aa
NEW Can renamed attached files on products and expense reports
2016-09-07 01:54:16 +02:00
aspangaro
37c7d49537
Presentation of fiscal year
2016-09-06 22:42:15 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
d4c35b7131
Fix bad translation
2016-09-04 23:45:14 +02:00
Laurent Destailleur
6da7410c18
Show warning for overwritten translation
2016-09-04 14:58:58 +02:00
Laurent Destailleur
d24045d831
NEW Editing translation GUI become easier with search translation tool.
2016-09-04 14:45:43 +02:00
Laurent Destailleur
13746a3c03
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:37:59 +02:00
Laurent Destailleur
aab3b2837a
FIX #5589
2016-09-02 22:34:37 +02:00
Laurent Destailleur
0e4b4ee321
Merge branch 'develop-external-logging' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging
Conflicts:
composer.json
2016-09-02 21:51:25 +02:00
Laurent Destailleur
91ede48390
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-01 11:37:40 +02:00
Laurent Destailleur
bf7a6380c9
Fix sort on wrong field
2016-09-01 01:00:28 +02:00
Laurent Destailleur
8fd082cf16
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
Laurent Destailleur
8352f64474
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/time.php
2016-08-31 01:04:33 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
florian HENRY
cd1f78cd52
continur working
2016-08-29 10:41:14 +02:00
florian HENRY
a4ce756724
Manage project category
2016-08-29 10:32:00 +02:00
aspangaro
7cb4f85f6b
Fix: Wrong language key
2016-08-29 07:30:39 +02:00
Laurent Destailleur
330e494eda
NEW Can filter on fields on admin translation page
2016-08-28 22:46:09 +02:00
Laurent Destailleur
2e7e5151b7
Merge pull request #5463 from hregis/develop_origin
...
New: Add entity field in llx_societe_remise_except and llx_societe_remise
2016-08-28 12:23:04 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Regis Houssin
6e40f9e700
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/core/class/html.form.class.php
Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
2016-08-25 10:15:26 +02:00
Laurent Destailleur
e22e243bc5
NEW Can set to paid automaically social or fiscal contributions after a
...
payment was recorded.
2016-08-22 14:31:15 +02:00
Laurent Destailleur
03c30c487c
Uniformise code
2016-08-22 13:46:38 +02:00
Laurent Destailleur
69e6f6a489
Merge pull request #5608 from aspangaro/4.0-p40
...
Fix: Some problems on export with language
2016-08-17 15:54:36 +02:00
Laurent Destailleur
906508ec6f
Close #4666
2016-08-17 15:40:17 +02:00
Laurent Destailleur
caa0dd75aa
Fix responsive design on small smartphone
2016-08-17 11:47:39 +02:00
Laurent Destailleur
ba8c2dbf9f
Fix order of module for demo.
2016-08-17 11:39:11 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules.
...
Removed Sentry logging.
2016-08-16 03:24:04 +02:00
aspangaro
cdd84244b2
Fix: Missing Language file and key for category contact export
2016-08-10 14:48:26 +02:00
aspangaro
b5771ebbfc
Fix: Missing language key for bank export
2016-08-10 14:39:11 +02:00
aspangaro
43ffb061ef
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
2016-08-10 08:07:27 +02:00
Laurent Destailleur
8c63d68083
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-09 17:28:16 +02:00
Laurent Destailleur
a2f1291f94
Fix missing supplier proposals in project overview
2016-08-09 17:28:02 +02:00
Laurent Destailleur
57cbda416b
Minor fix on stock
2016-08-08 20:41:49 +02:00
Laurent Destailleur
2133b1c3b5
NEW Table with list of lots/serial can be viewed (module product batch).
2016-08-08 20:31:03 +02:00
florian HENRY
95a66e7e63
Work on accoutancy PgSQL comptatiblity and other stuff
2016-08-08 14:52:19 +02:00
Laurent Destailleur
034b08ce56
NEW Add option "Hide images in Top menu".
2016-08-05 23:40:00 +02:00
Laurent Destailleur
126d9ae6bf
Merge pull request #5586 from atm-florian/dev_NEW_ClassOrderDeliverStatusOnStockVentil
...
NEW : Add workflow to calculated supplier order status on stock dispatch
2016-08-05 18:15:04 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
florian HENRY
0780188f4e
taking account @eldy remarks
2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_NEW_ClassOrderDeliverStatusOnStockVentil
Conflicts:
htdocs/langs/en_US/workflow.lang
2016-08-05 09:34:27 +02:00
Laurent Destailleur
63562beb36
Fix move translation key into source language
2016-08-05 01:19:20 +02:00
Laurent Destailleur
544d5af49b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +02:00
Laurent Destailleur
c73f962b28
Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation
...
NEW : Add workflow to classifed propal bill on invoice validation
2016-08-05 00:46:12 +02:00
Laurent Destailleur
9349f27742
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 17:10:02 +02:00
Laurent Destailleur
4b5cae0af8
Fix help
2016-08-04 17:09:49 +02:00
Laurent Destailleur
5126786d60
NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED
2016-08-04 15:48:34 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
florian HENRY
4001bc474e
NEW : Add workflow to calculated supplier order status on stock dispatch
2016-08-04 11:37:32 +02:00
Laurent Destailleur
182338beb1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-04 10:27:50 +02:00
Laurent Destailleur
11ab49d85d
Fix bad help
2016-08-04 10:27:19 +02:00
Laurent Destailleur
da84fac390
Fix: data were lost if creation failed
2016-08-04 10:08:58 +02:00
florian HENRY
f0622139ff
NEW : Add workflow to classifed propal bill on invoice validation
2016-08-04 09:55:16 +02:00
Laurent Destailleur
216ec6ac4b
Label week too long with some language
2016-08-02 23:33:31 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
edbd92ee3e
NEW Option SUPPLIER_ORDER_SHOW_FIRST_SALES_REP shows name of buyer on PO
2016-08-01 11:16:22 +02:00
aspangaro
4a0eb496fa
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
...
Conflicts:
htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
30ec33f152
Missing key language
2016-08-01 06:45:00 +02:00
Laurent Destailleur
0414f09e48
Fix permissions
2016-07-30 21:09:30 +02:00
Laurent Destailleur
a87c2f9579
Fix several fixes on margin reports
2016-07-30 18:57:26 +02:00
Laurent Destailleur
e5583f1544
Fix bad translation. Confusionbetween internal tranfert and bank
...
tranfert for payements
2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607
Fix multicurrency
2016-07-30 16:41:10 +02:00
Laurent Destailleur
a6147ee73b
Miscellaneous fixes
2016-07-30 14:49:29 +02:00
Laurent Destailleur
b3dab8a6f7
Better translation
2016-07-30 11:56:22 +02:00
Laurent Destailleur
ff9d6ce02a
Fix missing translation
2016-07-29 23:02:40 +02:00
aspangaro
20144c9883
FIX Accountancy - Problem with the manage of the zero at the end of an accounting account in dolibarr for somes countries. Add an option.
2016-07-29 07:32:55 +02:00
Regis Houssin
6bf655c882
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/societe/class/societe.class.php
Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
2016-07-28 09:53:10 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
3b1d6818b8
Update ldap translation
2016-07-27 17:26:04 +02:00
Laurent Destailleur
4d1885eb59
Fix: restore logout and logged translation key
2016-07-27 17:00:14 +02:00
Laurent Destailleur
e747c39809
Add test on curl prerequisite. Remove test on GD lib.
2016-07-27 16:52:02 +02:00
Laurent Destailleur
3d2dc3c66e
NEW Each user can select its landing page.
2016-07-26 21:12:52 +02:00
Laurent Destailleur
a167d56d5a
Hard code a warning to avoid confusion.
2016-07-26 16:40:37 +02:00
Juanjo Menent
0459c6f682
Merge pull request #5545 from GPCsolutions/develop-orderinterfix
...
Fix: Fixed interventions from order.
2016-07-26 12:01:09 +02:00
Laurent Destailleur
f0fa9205a2
Sync transifex
2016-07-26 09:56:20 +02:00
Laurent Destailleur
f0a3a5ce02
NEW Mutualize mass action. So "Send by email" is also avavilable on
...
orders.
2016-07-25 21:50:41 +02:00
Regis Houssin
4b8f42949c
# WARNING: head commit changed in the meantime
...
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Laurent Destailleur
3265b7028d
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-25 19:53:28 +02:00
Raphaël Doursenaud
052a11a5c0
Fixed interventions from order.
...
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.
Generalized services duration handling and exposed it in the module's
admin page.
2016-07-25 17:24:57 +02:00
Marcos García de La Fuente
b1c552ee9d
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/install/mysql/tables/llx_product_attribute.key.sql
# htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
2016-07-24 11:54:38 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
867a0072e3
Fix forcing on module setup was not working
2016-07-23 13:20:34 +02:00
Laurent Destailleur
1b9b4395b9
Fix lost translation keys
2016-07-23 13:07:34 +02:00
Laurent Destailleur
b085ce6916
Fix lost translation keys
2016-07-23 13:01:42 +02:00
Laurent Destailleur
08d23b482b
NEW Introduce mass action "delete" on sales orders.
2016-07-23 12:17:47 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
73aeb9fcce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-21 17:25:45 +02:00
Laurent Destailleur
b5334b47bd
Code comment. Add missing translation keyword
2016-07-21 16:22:43 +02:00
Laurent Destailleur
93bb929219
Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type
...
NEW : Add new password extrafields type
2016-07-21 14:01:07 +02:00
Laurent Destailleur
2600b28638
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-21 10:40:29 +02:00
Laurent Destailleur
9f61fc4f5e
Better translation
2016-07-21 10:40:13 +02:00
Laurent Destailleur
774e327831
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
9ebe704506
Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128
...
FIX #5128 if create method return duplicated code error
2016-07-21 09:55:26 +02:00
Laurent Destailleur
a290757d2d
Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany
...
NEW Option to allow payment on bills of different companies (with same parent company)
2016-07-20 19:34:51 +02:00
Raphaël Doursenaud
f2a479695e
New: Improved forced install process
...
Tamper proofed the process by not relying on POST values for forced fields.
Disabled all fields set when $force_install_noedit is set.
Added a full-featured forced install config file template.
On the side:
Improved Dolibarr root and url detection.
Prevent install locking if install was not successful.
Added missing translation on failed administrator creation.
Better escaping of posted values.
2016-07-20 14:22:35 +02:00
Laurent Destailleur
5e654e8cb3
Fix help
2016-07-18 11:49:34 +02:00
aspangaro
90a84335ab
Fix: Missing key language on home for boxes
2016-07-17 07:34:19 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d
Fix better error message when possible refering objects list is empty.
2016-07-16 14:37:35 +02:00
Laurent Destailleur
97b03e225b
NEW Add option "Stock can be negative". Off by default.
2016-07-15 19:57:35 +02:00
Laurent Destailleur
7263b29cb4
Merge pull request #5301 from atm-ph/fix_develop_issue_2858
...
NEW issue 2858 - Option to allow negative transfer
2016-07-15 18:15:20 +02:00
Laurent Destailleur
9ba1ca5acb
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
Laurent Destailleur
f256de323e
Fix management of preview for website module
2016-07-14 13:03:37 +02:00
Laurent Destailleur
914d56bb1b
Fix css for last chrome versions. max-width: 0 fails on box
2016-07-09 16:54:04 +02:00
Laurent Destailleur
c6ab11a9e5
Fix translation
2016-07-09 15:44:03 +02:00
Laurent Destailleur
a258663175
Fix edition of status were loosing old percent. We show it to allow user
...
to keep it if required.
2016-07-09 14:58:51 +02:00
Laurent Destailleur
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
d940cc392a
FIX Several fix to exclude WON/LOST of reporting of opportunities amount
...
(sometimes we need, sometimes not).
2016-07-08 10:59:13 +02:00
Laurent Destailleur
24a798ed2f
Fix restore translation for ModuleCompanyCode...
2016-07-07 14:13:33 +02:00
Regis Houssin
961a37d724
Merge remote-tracking branch 'origin/develop' into develop_origin
2016-07-07 12:45:03 +02:00
Regis Houssin
08725003b9
Fix: add entity field in llx_societe_remise, useful when third-sharing
...
is used with multicompany
2016-07-07 12:43:02 +02:00
Regis Houssin
ee02ff43d7
Fix: add entity field in llx_societe_remise_except, useful when
...
third-sharing is used with multicompany
2016-07-07 12:26:30 +02:00
Laurent Destailleur
2af7a8c584
Transifex sync
2016-07-07 10:06:35 +02:00
florian HENRY
2d932066c7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type
2016-07-07 09:17:39 +02:00
Laurent Destailleur
63ad970a27
Sync transifex
2016-07-07 04:26:22 +02:00
Laurent Destailleur
804159f3f3
Fix language files
2016-07-07 04:11:27 +02:00
Laurent Destailleur
f756f3db0e
Fix hook context 'all'
2016-07-07 01:23:20 +02:00
Laurent Destailleur
de157d9099
Fix quick search on tasks
2016-07-03 20:15:26 +02:00
Laurent Destailleur
3eaf0bc4bf
Fix bad translation
2016-07-02 11:32:06 +02:00
Laurent Destailleur
02e35f8c76
Fix where is the clone of intervention ?
2016-07-01 18:16:26 +02:00
Laurent Destailleur
5713d293e3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-01 03:22:16 +02:00
Laurent Destailleur
102179028c
FIX #5414
2016-07-01 03:11:41 +02:00
Laurent Destailleur
f3821c30f3
Merge pull request #5412 from atm-florian/dev_compta
...
Dev compta
2016-06-30 21:58:45 +02:00
Laurent Destailleur
3611161b67
Fix custom code should not appears on services
2016-06-30 19:35:11 +02:00
phf
8c133d8546
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858
...
Conflicts:
htdocs/core/class/ldap.class.php
2016-06-30 17:09:22 +02:00
Alexis Algoud
fa73dbe8e9
FIX #5128 if create method return duplicated code error
...
not use GETPOST in order to get a new code
2016-06-30 15:12:35 +02:00
florian HENRY
34fddbf3bc
addd export cogilog
2016-06-29 17:30:47 +02:00
florian HENRY
dfc4f3e7fe
on going accountacy working
2016-06-29 11:06:02 +02:00
Laurent Destailleur
6c0f842843
Missing translation
2016-06-28 17:53:59 +02:00
florian HENRY
52f2e228f1
Add new password extrafields type
2016-06-28 10:21:10 +02:00
Laurent Destailleur
7d2d38d7b5
Maj trad
2016-06-27 16:16:28 +02:00
Laurent Destailleur
9ec31aea0a
Use a more common translation
2016-06-27 15:28:19 +02:00
Laurent Destailleur
bc38bc63ca
Fix minor bug in direct printing with google cloud print
2016-06-26 21:18:44 +02:00
Laurent Destailleur
a8ba8e612a
Missing translation
2016-06-25 15:56:03 +02:00
Laurent Destailleur
266fef40ad
Add a way to enhance security check.
2016-06-25 15:16:32 +02:00
Laurent Destailleur
9ebf7a1e35
Try to fix the group_concat function for pgsql.
2016-06-25 02:21:54 +02:00
Laurent Destailleur
1368e6d462
Fix: error message was not enough to understand
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b
Fix: error message was not enough to understand
2016-06-24 17:04:59 +02:00
Laurent Destailleur
d72d22cda4
Fix confusing translation
2016-06-23 23:22:30 +02:00
Frédéric FRANCE
846c4855a8
Update admin.lang
2016-06-23 18:22:32 +02:00
Laurent Destailleur
d0f03d9ff6
Merge pull request #5376 from atm-florian/develop
...
FIX php warning method declaration
2016-06-23 10:02:13 +02:00
Laurent Destailleur
7fbbf7e8f0
Fix translation missing
2016-06-22 20:09:20 +02:00
florian HENRY
dfba0638ab
continue accoutancy and PG SQL compatibility
2016-06-22 11:28:21 +02:00
Laurent Destailleur
6317cb53f2
FIX Merge of 2 thirdparties when there is one common tag.
2016-06-20 15:42:16 +02:00
Laurent Destailleur
195fcc5653
Minor fixes
2016-06-20 11:43:53 +02:00
Laurent Destailleur
b01eed697e
Fix sort on thirdparty on bank transaction list
2016-06-20 11:30:43 +02:00
Laurent Destailleur
10f2d7cd67
Fix Debug and minor fixes
2016-06-20 10:54:02 +02:00
Laurent Destailleur
febf56e28c
Sync transifex
2016-06-20 03:21:35 +02:00
Laurent Destailleur
2223d283dc
Sync transifex
2016-06-20 00:45:25 +02:00
Laurent Destailleur
74f19944b9
Fix rtl language ar_SA
2016-06-20 00:13:30 +02:00
Laurent Destailleur
d0a15d32b2
Clean language files
2016-06-18 19:48:58 +02:00
Laurent Destailleur
f817b562ad
Clean language files
2016-06-18 17:17:45 +02:00
Laurent Destailleur
94b7e176a6
Clean language files
2016-06-18 16:46:21 +02:00
Laurent Destailleur
de76f2a9aa
Clean language files
2016-06-18 15:50:37 +02:00
Laurent Destailleur
d192438eae
Enhance tool to clean language files
2016-06-18 12:50:15 +02:00
Laurent Destailleur
4382f2a437
Clean language files
2016-06-18 11:06:11 +02:00
Laurent Destailleur
33dc2d5ec3
Sync lang
2016-06-17 19:29:58 +02:00
Laurent Destailleur
4ceba62116
Merge pull request #5320 from novalore/develop
...
fixes and typos in en_US lang files
2016-06-16 20:27:00 +02:00
Laurent Destailleur
3720c95a52
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-06-16 09:50:45 +02:00
Laurent Destailleur
2395099d0f
Debug Oauth
2016-06-15 17:20:00 +02:00
gauthier
a0051a856a
NEW : conf to allow payments on different thirdparties bills but same parent company
2016-06-15 17:10:42 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
6034ba658c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-06-10 18:59:05 +02:00
Laurent Destailleur
ccba65fe74
Clean dead code
2016-06-09 22:30:50 +02:00
Laurent Destailleur
f5d7c6fda5
Fix translation of desired stock (this is more clear)
2016-06-08 09:57:03 +02:00
novalore
54fbd2b23a
fixes and typos in en_US lang files
2016-06-07 12:48:47 +02:00
Laurent Destailleur
cc8db0d0df
FIX #2605 Request 4 - Missing last supplier proposal on thirdparty card.
2016-06-06 21:26:31 +02:00
Laurent Destailleur
47308d27c3
Missing column import_key and import for vat payments
2016-06-06 14:37:06 +02:00
Laurent Destailleur
9eee61e6b7
Fix trans
2016-06-06 11:13:19 +02:00
novalore
b52c441c64
english fix in accountancy for currency
2016-06-05 02:26:10 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00
phf
c62a69ccc8
Merge branch 'fix_3.7_issue_2858' into develop
2016-06-04 18:54:55 +02:00
novalore
c5ed9e723f
bills.lang: TIP payment fixed in en_US
2016-06-04 18:39:04 +02:00
phf
3cbbdf5e20
Fix #2858
2016-06-04 18:23:22 +02:00
novalore
5de8b6eee5
correction on banks.lang as mentioned in #5267
2016-06-04 18:04:49 +02:00
novalore
2d907bc727
miscellaneous lang fixes in en_US
2016-06-04 17:34:23 +02:00
novalore
dcd83c403b
Fix #4968
2016-06-04 17:34:04 +02:00
phf
a62f5bd5b4
Fix #2777
2016-06-04 17:17:22 +02:00
Laurent Destailleur
054329c319
Merge pull request #5283 from novalore/develop
...
en_US lang fixes again
2016-06-04 14:34:15 +02:00
Laurent Destailleur
674164b71c
Add a better explanation on job generation
2016-06-04 14:30:05 +02:00
novalore
d924be8b95
en_US lang fixes again
2016-06-04 14:21:21 +02:00
Maxime Kohlhaas
d777fca0b9
Warning messages after module activation and for user with no permission
2016-06-04 13:25:39 +02:00
Laurent Destailleur
bfb7923d4c
Merge pull request #5268 from atm-ph/fix_multicurrency_conf
...
Fix conf useful has been commented
2016-06-04 11:37:01 +02:00
novalore
3ee8f931b4
other fixes in en_US lang files
2016-06-04 02:16:58 +02:00
Laurent Destailleur
c9834117c9
Fix #5156
2016-06-04 02:03:30 +02:00
phf
b000ccf2e2
Fix traduction for multicurrency module
2016-06-04 01:46:10 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
b51c4ab57b
Merge pull request #5275 from novalore/develop
...
Miscellaneous typos and errors in en_US lang files
2016-06-04 00:20:27 +02:00
novalore
e2ba9c72a8
French string in main.lang
2016-06-04 00:18:15 +02:00
novalore
1227ee5eb6
Miscellaneous typos and errors in en_US lang files
2016-06-04 00:14:56 +02:00
Laurent Destailleur
776118a152
FIX Translation of lithuania
2016-06-03 21:32:12 +02:00
Laurent Destailleur
ebd8f2cf86
Prepare 4.0
2016-06-02 13:33:22 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
780d1628a9
Missing trans
2016-06-01 21:19:21 +02:00
Laurent Destailleur
7519c4a602
FIX Log of tax
...
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Laurent Destailleur
0d277083e6
Fix duplicate translation
2016-05-30 19:56:59 +02:00
Laurent Destailleur
3ddf427ff1
FIX Legal issue for GB. Add hidden option for this.
2016-05-30 00:52:16 +02:00
Laurent Destailleur
c653acd4ce
Minor fixes
2016-05-27 14:56:59 +02:00
Laurent Destailleur
b410aa57b9
Fix: Fetching category on label is not enough. We must introduce type
2016-05-25 15:36:48 +02:00
Laurent Destailleur
b476153b8b
Move POS at end of top menu
2016-05-25 00:02:48 +02:00
Laurent Destailleur
a587ba496c
NEW Can select fields on supplier orders
2016-05-24 18:43:35 +02:00
Laurent Destailleur
7935967c62
Fix duplicate translation key
2016-05-21 12:30:58 +02:00
Laurent Destailleur
5fd64c81a6
Missing translation
2016-05-21 12:21:17 +02:00
Laurent Destailleur
fd38db388a
Rename box into widget
2016-05-19 10:05:02 +02:00
Laurent Destailleur
ee73a91c77
Merge pull request #5218 from atm-florian/develop
...
Fix : Advanced Accountancy module
2016-05-18 20:22:07 +02:00
Laurent Destailleur
89d37ccc62
Fix translation
2016-05-17 21:55:39 +02:00
Laurent Destailleur
7bbb3a7da1
Supplier proposal was missing
2016-05-17 19:34:23 +02:00
Laurent Destailleur
e2d3f4e27d
Supplier proposal was missing
2016-05-17 19:15:44 +02:00
Laurent Destailleur
79be93d998
FIX The table llx_product_lot is now filled/used to store eatby/sellby
...
dates.
2016-05-17 18:19:36 +02:00
florian HENRY
a45680dc19
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2016-05-17 08:37:22 +02:00
Laurent Destailleur
1973f67d41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-17 01:11:14 +02:00
Laurent Destailleur
3a28935da3
Merge remote-tracking branch 'origin/3.9' into develop
2016-05-17 01:10:22 +02:00
florian HENRY
b8d452596c
Fix : Advanced Accountancy module
2016-05-16 16:37:07 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
cba0ef5693
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-05-14 00:44:38 +02:00
philippe grand
cd801fe1dd
Merge remote-tracking branch 'upstream/develop' into develop
2016-05-13 14:51:07 +02:00
Laurent Destailleur
55e904bc01
Debug for expert accounting module
2016-05-12 20:45:05 +02:00
Laurent Destailleur
a83a291856
Translation for one char
2016-05-12 19:55:36 +02:00
Laurent Destailleur
ab6fbb1bca
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-05-09 19:37:58 +02:00
Laurent Destailleur
a8f50283c0
Fix bad translation
2016-05-09 19:37:14 +02:00
Laurent Destailleur
9d3ad36b78
NEW If error is reported during migration process, you can ignore it to
...
avoid to be locked.
2016-05-09 11:06:18 +02:00
Laurent Destailleur
1835caad7b
Better translation
2016-05-09 08:53:09 +02:00
philippe grand
e8bd56a0d7
add new translation
2016-05-08 15:53:01 +02:00
Laurent Destailleur
6bb269381a
Merge pull request #5143 from frederic34/morecateg
...
categories account like other categories
2016-05-07 20:25:17 +02:00
Laurent Destailleur
5bee176ff8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-07 17:12:43 +02:00
Laurent Destailleur
82745d32df
NEW Survey system has now a status like other objects. You can close or
...
reopen a survey.
2016-05-07 17:12:31 +02:00
Laurent Destailleur
25dfa0c5b9
Work on website
2016-05-07 16:38:32 +02:00
Juanjo Menent
156a5349c1
Merge pull request #5171 from atm-ph/fix_develop_delete_buy_price
...
Fix no confirm window if we delete buying price
2016-05-07 00:46:05 +02:00
Laurent Destailleur
91d300289f
Minor fix in presentation
2016-05-06 12:15:44 +02:00
phf
0d03360375
Fix no confirm window if we delete buying price
2016-05-06 09:24:10 +02:00
Laurent Destailleur
cdbbe8d87b
Minor fixes
2016-05-05 23:44:44 +02:00
Laurent Destailleur
2960fb6df7
FIX Option not tested everywhere
2016-05-05 23:28:22 +02:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
816dda5a8b
Merge pull request #5158 from aspangaro/4.0-p29
...
FIX: Accountancy - Little fix et add page to assign massively the category
2016-05-05 22:52:20 +02:00
Laurent Destailleur
ca37a90a1b
Better explanation
2016-05-05 22:26:42 +02:00
Laurent Destailleur
d2df537d43
Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project
...
NEW allow a document to be linked to project from another customer
2016-05-05 22:24:32 +02:00
Laurent Destailleur
10c7b167ea
Merge pull request #5115 from fappels/develop-new-warehouse-only-internal-status
...
NEW prepare for additional warehouse statuses
2016-05-05 21:27:47 +02:00
Laurent Destailleur
b4e5acbaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2016-05-04 14:43:40 +02:00
Laurent Destailleur
911e862a8e
Fix missing translation and add a TODO to avoid infinite loop.
2016-05-04 13:49:05 +02:00
Florian HENRY
3d57e83094
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
aspangaro
e0f600f226
FIX: Accountancy - Little fix et add page to assign massively the category
2016-05-02 20:21:37 +02:00
Laurent Destailleur
d69904c14d
Can set the home page of web sites
2016-05-02 15:51:18 +02:00
abb
23c0a0a64e
conflict solved Merge branch 'develop' into abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-05-02 01:28:46 +01:00
Laurent Destailleur
5823055cdf
Work on website module.
2016-05-01 21:19:29 +02:00
Laurent Destailleur
46e2ed2810
NEW: All variant of ckeditor config can be tested into the setup page of
...
module.
2016-05-01 20:36:42 +02:00
Laurent Destailleur
3045449dbb
Work on website module. Can delete a page.
2016-05-01 17:01:38 +02:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
frederic34
17463b4927
categories account like other categories
2016-04-30 14:45:24 +02:00
Laurent Destailleur
4e9ea2786a
Fix s
2016-04-30 01:43:34 +02:00
Laurent Destailleur
e8bd1357f3
More help to use REST API
2016-04-30 00:00:59 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
0ed998af03
Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN""
2016-04-29 19:01:38 +02:00
Laurent Destailleur
3a74946210
Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"
2016-04-29 18:59:54 +02:00
Alexis Algoud
e5b6d39e51
NEW allow a document to be linked to project from another customer on config
2016-04-29 18:04:59 +02:00
Juanjo Menent
6d58103d11
Merge pull request #5091 from marcosgdf/fr-4972
...
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
2016-04-29 12:03:04 +02:00
Juanjo Menent
d6b1cd8a1c
Merge pull request #5083 from aspangaro/4.0-p22
...
FIX: Accountancy - Work on categories for report - Add french example & other
2016-04-29 11:59:41 +02:00
fappels
65ea83fa06
NEW prepare for additional warehouse statuses
...
Add additional warehouse statuses, so you can add extra filter
possibility. For example hide warehouses with damaged stock from
shipping. Feature is still hidden by conf ENTREPOT_EXTRA_STATUS
Still TODO: config all $formproduct->selectWarehouses
2016-04-27 16:51:51 +02:00
Laurent Destailleur
4758c82d41
Solve minor translation
2016-04-26 09:45:19 +02:00
Alexis Algoud
91bea8b9fe
fix inclusion
2016-04-25 18:54:28 +02:00
Alexis Algoud
bf1f805bf6
FIX trad
2016-04-25 18:40:38 +02:00
Laurent Destailleur
ccdbf69cd5
Bette explanation on how to create an repeatable invoice
2016-04-24 18:11:19 +02:00
Marcos García de La Fuente
82ee964c27
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
...
Close #4972
2016-04-23 18:22:11 +02:00
aspangaro
04fd5a20ef
FIX: Accountancy Work on categories for Report - Add french example
2016-04-23 15:43:28 +02:00
Marcos García de La Fuente
867649e922
FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
...
Close #4813
2016-04-23 13:36:12 +02:00
Laurent Destailleur
fb53b41078
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 19:20:04 +02:00
Laurent Destailleur
bcc0f0c488
Merge pull request #5067 from grandoc/develop
...
Fix : missing translation
2016-04-22 19:12:36 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
2cc24db6a2
Fix typo
2016-04-22 13:45:54 +02:00
Laurent Destailleur
7515b2ba7b
NEW Add a parameter on graph function to show a generic graph when no
...
data are available.
2016-04-22 12:11:57 +02:00
Laurent Destailleur
78d18185e4
Several css enhancements
2016-04-22 11:11:08 +02:00
philippe grand
0c7d7245a8
missing translation
2016-04-22 09:37:35 +02:00
Laurent Destailleur
4619040983
Work on website module
2016-04-19 18:41:05 +02:00
aspangaro
b59c94e056
NEW: Accountancy - Add Result page
...
& review
2016-04-17 15:44:04 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
448758bbf4
Merge branch 'develop_NEW_supplier_price_reputation' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-08 22:01:55 +02:00
Laurent Destailleur
010a4f8929
Merge pull request #4945 from frederic34/shipcust
...
NEW : Select Preferred Sending Method for a third party
2016-04-08 21:31:06 +02:00
Laurent Destailleur
f14b03a230
NEW Add more trackable events (create, submit and receive supplier
...
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
2016-04-08 17:07:25 +02:00
Laurent Destailleur
5753f21745
Missing translations
2016-04-08 16:09:35 +02:00
Laurent Destailleur
eb7bba9568
Fix translation
2016-04-08 16:07:30 +02:00
Laurent Destailleur
a74fc347bb
Fix translation
2016-04-08 15:41:01 +02:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
cefc373a5f
Missing translations
2016-04-08 11:42:02 +02:00
Laurent Destailleur
7a48ceb635
Uniformize code for mass actions
2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0
NEW Can select fields to show on list also for list of customer orders,
...
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0
Work on select fields for orders, invoices and shipments
2016-04-08 01:00:02 +02:00
Laurent Destailleur
ee53a8b1a8
NEW Can filter modules on publisher
2016-04-06 16:45:22 +02:00
Laurent Destailleur
a43a0a3f4c
Debug module loan and disable non working features
2016-04-06 11:21:55 +02:00
Alexis Algoud
61a077b0ee
NEW reputation for price supplier
2016-04-06 09:58:03 +02:00
frederic34
e53501f89d
add lang
2016-04-04 18:37:04 +02:00
Laurent Destailleur
5101c96223
Restore button to create object from the project view.
2016-04-04 15:25:08 +02:00
Florian HENRY
344a87f970
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/class/html.formaccounting.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Florian HENRY
ae51321040
Debug Advance target emailing
2016-04-01 14:30:02 +02:00
Florian HENRY
867dbc766e
Merge branch 'develop' into develop_advtargetemailiing
2016-04-01 14:03:43 +02:00
Laurent Destailleur
be483bd787
FIX Some records were lost into margin per product report
2016-04-01 12:28:15 +02:00
Laurent Destailleur
8a1358d539
FIX Some records were lost into margin per product report
2016-04-01 12:27:49 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
Laurent Destailleur
54f3005666
NEW Can select fields to show on proposal lists.
2016-03-31 11:58:05 +02:00
Laurent Destailleur
27cf494009
Fix bad translation
2016-03-30 23:35:43 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
0c3635cf8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-30 15:25:27 +02:00
Laurent Destailleur
e908b983d4
NEW Can search on shipments into the quick search box
2016-03-30 15:25:16 +02:00
aspangaro
c9271e04a0
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-29 19:54:41 +02:00
Laurent Destailleur
6b4909f802
Lost sort params
2016-03-29 15:31:52 +02:00
Laurent Destailleur
6188c3fced
NEW Introduce a predefined job to run database backup
2016-03-29 14:52:27 +02:00
aspangaro
432cc44ab6
NEW: Accountancy - Add category
2016-03-28 13:51:19 +02:00
Laurent Destailleur
4145874d34
Better tranlsation message
2016-03-26 12:29:13 +01:00
Laurent Destailleur
facdddbb23
Merge pull request #4888 from defrance/patch-112
...
Add : new translations
2016-03-25 18:13:45 +01:00
Laurent Destailleur
46fe16be0b
Merge pull request #4871 from sbechet/develop
...
Postgresql compatibility patch + cosmetic
2016-03-25 17:57:29 +01:00
aspangaro
05df3408f2
Debug works
2016-03-25 15:59:38 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
BENKE Charlie
efa7761b34
Add : new translations
2016-03-24 13:48:45 +01:00
aspangaro
1712ad04cc
Debug works
2016-03-23 22:23:59 +01:00
Sebastien Bechet
82f74ceb38
Postgresql compatibility patch + cosmetic
2016-03-22 10:09:41 +01:00
Michael Fenton
51125483aa
Update main.lang
...
Changing 'Quadri' to Quarter..
2016-03-19 20:03:26 +11:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
5edeeae384
FIX Bad error and style message when changing its own login
2016-03-18 11:30:15 +01:00
Laurent Destailleur
44dc07a61b
Merge pull request #4807 from bafbes/abb-13
...
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-18 02:40:27 +01:00
Laurent Destailleur
c20124e369
Merge pull request #4829 from jtisseau/starttls
...
NEW Sending email can also use the STARTTLS protocol.
2016-03-18 00:48:13 +01:00
Laurent Destailleur
7692c39879
Merge pull request #4614 from bafbes/abb-3
...
include expense reports in linked objects section and provide template for them in this section
2016-03-18 00:26:24 +01:00
Laurent Destailleur
dfcd72399a
Missing translation
2016-03-17 11:37:07 +01:00
Laurent Destailleur
eb3ffb30c5
Add mongolian language
2016-03-16 11:29:56 +01:00
Laurent Destailleur
6269503888
Add es_EC and es_PA language
2016-03-16 11:23:00 +01:00
jtisseau
969893a5b1
Adds multilanguage translations for MAIN_MAIL_EMAIL_STARTTLS
...
Adds the translations for all languages having the MAIN_MAIL_EMAIL_TLS
const defined. It's just a copy of this last one changing the "(SSL)" by
"(STARTTLS)".
2016-03-16 02:23:06 +01:00
abb
b6e39960b4
new:handle user notification in notification module
...
Conflicts:
htdocs/core/lib/usergroups.lib.php
2016-03-13 20:08:27 +01:00
abb
d35f728fad
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-13 19:58:39 +01:00
Laurent Destailleur
8b16a76936
Avoid duplicate translation
2016-03-11 10:59:28 +01:00
Laurent Destailleur
2e1a63a1f3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/compta.lang
htdocs/societe/class/societe.class.php
htdocs/societe/commerciaux.php
htdocs/societe/consumption.php
2016-03-10 15:09:30 +01:00
Laurent Destailleur
45ab31815b
Merge pull request #4767 from grandoc/3.9
...
fix : missing translation
2016-03-10 13:34:09 +01:00
Laurent Destailleur
a61882d847
Sync transifex
2016-03-10 12:44:05 +01:00
Laurent Destailleur
5bd5323c93
Finished to move the mergepdftool dedicated page into the generic "mass
...
actions" feature.
2016-03-10 12:11:11 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
philippe grand
44d71c2bb4
fix : missing translation
2016-03-08 09:08:31 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
philippe grand
bd0320dea0
fix : missing traduction
2016-03-04 16:30:47 +01:00
Laurent Destailleur
6e8b176d8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-04 16:24:03 +01:00
Laurent Destailleur
36474eabec
NEW Add stats and late records into dashboard for supplier proposals.
2016-03-04 16:14:23 +01:00
Laurent Destailleur
f06911a8b0
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
cb7ae31c65
Merge pull request #4722 from grandoc/develop
...
fix : missing translation
2016-03-04 15:31:42 +01:00
philippe grand
6851c3fdb0
fix : missing translation
2016-03-03 16:18:07 +01:00
philippe grand
4a3509d350
fix : missing translation
2016-03-03 16:09:19 +01:00
philippe grand
74601a0b1d
fix : missing translation
2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947
fix : missing translation
2016-03-03 15:45:42 +01:00
Laurent Destailleur
40144eee8d
NEW linked object can show now the recurring invoices with other linked
...
objects.
2016-03-03 13:38:16 +01:00
Laurent Destailleur
3cbeca26e7
NEW When creating a template invoice from a draft invoice, if there is
...
link to contract on draft invoice, link is kept on template invoice.
2016-03-03 13:16:46 +01:00
philippe grand
ba2c0db159
fix : missing translation
2016-03-03 12:00:08 +01:00
philippe grand
9f798bc3fc
fix : missing translation
2016-03-03 11:54:12 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
philippe grand
59c4559a78
fix : missing translation
2016-03-02 21:13:12 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
Laurent Destailleur
fe83a6595a
Remove duplicate translation keys
2016-02-27 16:17:49 +01:00
Juanjo Menent
c2c6d77caa
FIX : Improve and add missing translations
...
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949
FIX : Improve and add missing translations
...
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018
FIX : Improve and add missing translations
...
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:17:22 +01:00
Laurent Destailleur
0d6546e18e
NEW Add an explanation message on shipment page to explain you can't
...
make shipment if order is not validated
2016-02-25 18:18:33 +01:00
Laurent Destailleur
a95240e33d
FIX Some troubles into weight and volume calculation when unit differs.
...
NEW Introduce a function showDimensionInBestUnit
2016-02-25 13:46:38 +01:00
Laurent Destailleur
b0f816a400
NEW Add weight/volume for one product into shipment export
2016-02-25 02:22:40 +01:00
Laurent Destailleur
4b89b0b7aa
Fix bad status translation for shipment
2016-02-24 22:13:29 +01:00
Laurent Destailleur
6ee4637f35
Fix bad status translation for shipment
2016-02-24 22:12:38 +01:00
Laurent Destailleur
02c0f52880
NEW Include sales representative into export of thirdparties
2016-02-24 16:56:24 +01:00
Laurent Destailleur
371dec8503
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/langs/en_US/products.lang
htdocs/langs/fr_FR/companies.lang
2016-02-24 12:13:12 +01:00
Laurent Destailleur
5d1241be2f
Sync transifex
2016-02-24 12:10:25 +01:00
Laurent Destailleur
449d44419d
Fix: When module shipment is on, a contact of order is also contact of
...
shipment
2016-02-24 11:17:47 +01:00
Laurent Destailleur
843dada35d
Fix translation export/import
2016-02-22 17:42:41 +01:00
Laurent Destailleur
81116da33b
Add a control of file format
2016-02-22 15:10:33 +01:00
Laurent Destailleur
cfdaa0e13c
Fix missing translation
...
Fix import of state
2016-02-22 14:49:30 +01:00
Laurent Destailleur
3c2b50c6a2
Include PR
2016-02-21 19:14:18 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
Laurent Destailleur
7def330f54
Fix missing error message and input lost in shipment create page
2016-02-20 03:58:52 +01:00
Laurent Destailleur
0ec6c20ebb
Translation
2016-02-20 02:55:32 +01:00
Laurent Destailleur
f762196c77
NEW Can define number of first and last line into import wizard.
2016-02-20 02:21:24 +01:00
Laurent Destailleur
4754ba5683
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/data/llx_10_c_regions.sql
htdocs/install/mysql/data/llx_20_c_departements.sql
htdocs/install/mysql/data/llx_c_forme_juridique.sql
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/companies.lang
htdocs/langs/fr_FR/compta.lang
2016-02-19 20:17:51 +01:00
Laurent Destailleur
0faebc25ba
Update translations
2016-02-19 19:33:31 +01:00
Laurent Destailleur
da284cda8c
Add category Supplier Relationship Manager
2016-02-19 19:20:21 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
16c44af690
Fix bad example of setup to use
2016-02-19 02:44:56 +01:00
Laurent Destailleur
b0b2668428
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89
Several fixes in stock management (label, and bad action when lot module
...
is on)
2016-02-18 23:21:02 +01:00
BENKE Charlie
7939169ae8
Change projets title Area
2016-02-18 11:54:48 +01:00
Laurent Destailleur
633de3bcb4
Fix list of object referers should not be set to invoice by default (may
...
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
Laurent Destailleur
e0a0817123
Merge pull request #4623 from IonAgorria/dynamic-price-changes
...
Dynamic price corretions/changes
2016-02-16 15:11:02 +01:00
Laurent Destailleur
9d418bca7f
Merge branch 'new_add_customer_multicurrency_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-16 15:06:39 +01:00
Laurent Destailleur
fad09357f4
NEW Show total number of modules into the module list
2016-02-16 12:54:42 +01:00
Laurent Destailleur
36b0cb5b23
NEW Merge all admin tools (system and module admin tools) into same
...
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
2016-02-16 12:50:15 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
phf
86c8998742
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351
Add fields to link recurring invoice lines with contract origin when it
...
comes from this.
2016-02-15 16:13:33 +01:00
Laurent Destailleur
23afb80c82
Can remove status recurring or not of template invoice
2016-02-15 14:42:05 +01:00
Laurent Destailleur
c1c8ead49f
Debug multicurrency module
2016-02-15 00:58:51 +01:00
Laurent Destailleur
e8bc88fffe
Merge branch 'new_recurring_invoice' of
...
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:45:39 +01:00
Laurent Destailleur
71a12824c9
Merge branch 'new_numbering_module_supplier_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:31:33 +01:00
Laurent Destailleur
4bb980830f
Merge pull request #4571 from defrance/patch-99
...
Add Good Customers Boxes
2016-02-14 20:56:22 +01:00
Ion Agorria
b1568a7319
Better Add buttons in dynamicprice module
2016-02-14 16:35:17 +01:00
Laurent Destailleur
04114a5e1e
Provide a better explanation on how the module dynamic price works
2016-02-13 03:11:27 +01:00
abb
4dce09cd27
include expense reports in linked objects section and provide template for them in this section
...
Conflicts:
htdocs/core/class/html.form.class.php
2016-02-13 00:37:38 +01:00
phf
1143612bc0
Fix add key in traduction lang
2016-02-12 16:03:01 +01:00
Laurent Destailleur
d0ab1db19b
NEW When emailing is not sent completely, show progression
2016-02-12 14:21:44 +01:00
phf
875e01aeee
New add recurrence fields on create form of invoice model
...
Fix missing fields in database about multicurrency
2016-02-11 09:50:35 +01:00
aspangaro
f1a26cf54b
Correct problem of merging for language file
2016-02-11 06:49:49 +01:00
aspangaro
87fee74fb1
Modify menu for accountancy module - New balance feature
2016-02-11 06:48:23 +01:00
aspangaro
b47252fcb6
Modifiy menu for accountancy module - New balance feature
2016-02-11 06:39:02 +01:00
phf
a0cfe9aad8
New add payment with multicurrency module
2016-02-10 23:16:38 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
d89daf9cd2
Work to move the merge pdf tool into the mass action combo of lists
2016-02-08 18:04:42 +01:00
Laurent Destailleur
404663472a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14
More robust error management on barcode module.
2016-02-08 15:49:38 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
99c59c8c6b
Missing translation
2016-02-07 23:01:21 +01:00
aspangaro
eaca582cb5
Fixed: Problem of merging - Review page init accountancy again
2016-02-07 08:47:02 +01:00
Laurent Destailleur
806d3642d8
FIX Bad filter on opportunities
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2016-02-06 15:09:57 +01:00
Laurent Destailleur
3828fe7026
FIX Bad filter on opportunities
2016-02-06 15:06:37 +01:00
phf
d66bc6f1b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
BENKE Charlie
59c9d85275
Update boxes.lang
2016-02-05 23:38:04 +01:00
Laurent Destailleur
fd7a05490d
DiscountOffered text was too long
2016-02-05 20:06:07 +01:00
Laurent Destailleur
cb66448148
Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields
...
NEW feature hidden extrafields
2016-02-05 17:22:51 +01:00
BENKE Charlie
9c896b1869
translations too
2016-02-04 18:10:28 +01:00
abcnet-lu
1e9ea4f2ac
[ #4568 ] Add professional IDs for Luxembourg
2016-02-04 16:40:49 +01:00
phf
75c4888364
NEW feature hidden extrafields
2016-02-03 22:49:43 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
392d75b89e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-02 16:33:00 +01:00
Laurent Destailleur
1fb1da5be4
Work on website module
2016-02-02 16:24:12 +01:00
Laurent Destailleur
82cc0b409c
Merge pull request #4546 from bafbes/bra
...
provide link section in expense reports and add option for intervention
2016-02-02 16:17:25 +01:00
Laurent Destailleur
0def82f596
Merge pull request #4543 from aspangaro/develop-export
...
New: Add User accountancy code in user export
2016-02-02 15:32:56 +01:00
Laurent Destailleur
c54ebfebb5
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-31 21:28:14 +01:00
Laurent Destailleur
640adcc666
Missing translation
2016-01-31 21:23:30 +01:00
abb
773ee5c0ea
provide link section in expenses and add option for intervention
2016-01-31 19:59:47 +01:00
Laurent Destailleur
2cde6f39ff
Missing error message
2016-01-31 15:16:45 +01:00
Laurent Destailleur
928336c835
NEW Clean and enhance code for cron engine
2016-01-31 15:14:50 +01:00
aspangaro
6a12cdc876
New: Add User accountancy code in export
2016-01-31 08:18:47 +01:00
Laurent Destailleur
a31e035bc6
Add more explanation on late definition
2016-01-30 16:19:49 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
129f5aad8e
Fix bad translation
2016-01-30 15:56:04 +01:00
Laurent Destailleur
c6a6889d79
Merge pull request #4389 from aspangaro/3.9-p6
...
Fix: Some problems presentation on accountancy module
2016-01-30 13:04:22 +01:00
Laurent Destailleur
19d119d3a4
Debug cron module.
...
Task to delete temporary files older than 24 is on by default.
2016-01-30 02:51:26 +01:00
Laurent Destailleur
b162eb1bb0
Update translation for 3.9
2016-01-29 00:40:15 +01:00
Laurent Destailleur
08b3b0cf19
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-28 23:50:23 +01:00
Laurent Destailleur
7c2ac4b3ee
NEW The probability of lead/opportunity can be defined per lead.
2016-01-28 20:04:02 +01:00
Laurent Destailleur
99b2236260
FIX Selection of project must no show closed project
2016-01-28 12:19:13 +01:00
Laurent Destailleur
c8d232e056
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/card.php
2016-01-28 12:18:25 +01:00
Laurent Destailleur
df4cd3de17
FIX Selection of project must no show closed project
2016-01-28 12:05:14 +01:00
Laurent Destailleur
25924f31ad
Bad translation
2016-01-26 17:57:57 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
ce02f05d43
Translation of dashboard
2016-01-25 17:18:17 +01:00
Laurent Destailleur
274caf61eb
NEW Add statistics for interventions module
2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b
NEW Module "Supplier commercial proposal" (price request) is set to
...
stable status.
2016-01-25 12:33:38 +01:00
Laurent Destailleur
8d46a56dac
Work on CMS module
2016-01-24 21:17:11 +01:00
aspangaro
73d5e7036f
Refactoring eldy menu to test
2016-01-24 08:21:18 +01:00
Laurent Destailleur
9642bb44dc
Merge pull request #4470 from aspangaro/develop-MA_CICE
...
New: Add a new Id. prof. for Morrocan
2016-01-22 04:17:13 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
aspangaro
ce01155678
New: Add a new Id. prof. for Morrocan
2016-01-21 06:01:05 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
Laurent Destailleur
0f456c46ab
Clean project pages to work like other modules
2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
9642967c1f
NEW Indicator on workboard are red/green if late or not.
2016-01-18 12:57:24 +01:00
Laurent Destailleur
6bccac5691
NEW Add Expense report to approve into workboard
...
NEW Selection of boxes is move on top
2016-01-18 11:35:45 +01:00
Laurent Destailleur
4d2b5d71af
Fix missing translation key
2016-01-17 17:35:02 +01:00
Laurent Destailleur
4a009d2ad2
NEW On translation admin page, admin can overwrite a translation value.
2016-01-16 00:48:14 +01:00
Marcos García
ca6c2b4317
Update products.lang
2016-01-15 09:49:52 +01:00
Laurent Destailleur
524614ded9
Start to work on a per type view of agenda
2016-01-14 16:52:46 +01:00
Laurent Destailleur
a6416b8797
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad
Fix: no need of translation tab if multilang was disabled.
2016-01-14 15:00:31 +01:00
Laurent Destailleur
7b14b5e115
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2016-01-14 13:30:27 +01:00
Laurent Destailleur
23dd6b8388
Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
...
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:35:55 +01:00
Laurent Destailleur
0f5e208127
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-13 20:43:49 +01:00
Laurent Destailleur
13f10d55fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-13 20:42:32 +01:00
Laurent Destailleur
71b264dd86
FIX Bug: Delivery order and date are not displayed #4372
...
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
2016-01-13 20:41:32 +01:00
phf
d213fbae08
FIX invoice situation
2016-01-13 13:42:58 +01:00
Laurent Destailleur
d396612a7c
NEW: Add a new method for margin calculation. Added margin on "cost
...
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
Laurent Destailleur
0a255decf8
Merge pull request #4401 from aspangaro/develop-p2
...
New: #3292 Make sure each and every page displays a title
2016-01-12 23:19:17 +01:00
Laurent Destailleur
381eea0dbf
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-01-12 23:10:25 +01:00
aspangaro
cf6be40922
New: #3292 Make sure each and every page displays a title
2016-01-11 22:03:26 +01:00
Laurent Destailleur
6684bdce84
Merge pull request #4349 from benlo06/fr_4347
...
CLOSE #4347 Add payment label to invoices csv exports
2016-01-10 11:47:25 +01:00
Laurent Destailleur
c07cb5a72e
Merge pull request #4371 from frederic34/patch-7
...
Always show remove button and why we can't remove
2016-01-10 11:37:56 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
095ee47724
Merge pull request #4268 from aspangaro/develop-a7
...
Accountancy Review page to init accountancy on product/service
2016-01-09 17:45:42 +01:00
Frédéric FRANCE
55fb824a08
Update bills.lang
2016-01-09 10:43:34 +01:00
aspangaro
3ff9fe3123
Fix: Add missing key language for propal
2016-01-09 08:26:08 +01:00
Laurent Destailleur
a8758fa5b7
Bug war week-end: Fix a duplicate page on holiday, fix missing badge on
...
some documents tabs.
2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552
FIX It was not possible to define if leave type need to be followed by a
...
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
2016-01-09 01:18:53 +01:00
Laurent Destailleur
e79750dc89
I continue bug war week-end
2016-01-09 00:44:06 +01:00
Laurent Destailleur
127354f0af
Minor fixes
2016-01-08 22:41:30 +01:00
Laurent Destailleur
c9176cd6b4
Missing translation
2016-01-08 18:22:41 +01:00
Benlo
4aef3d29c1
FIX 4347 : Add labels in translations and change order
2016-01-08 15:03:46 +01:00
Laurent Destailleur
6a058edc23
Revert "Debug of module leave requests "
2016-01-08 14:15:22 +01:00
TBAI
8c48785de7
Debug of module leave requests
...
Add text in holiday module
2016-01-07 20:10:22 +01:00
Laurent Destailleur
4e2d4a6651
Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.
...
Solved this by completing tooltip info.
2016-01-07 11:01:37 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
aspangaro
2c1ff3ca47
Merge remote-tracking branch 'Upstream/develop' into develop-a7
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2015-12-31 06:07:08 +01:00
Laurent Destailleur
41516093bb
Syn transifex
2015-12-28 12:21:24 +01:00
bobby
e557c002c8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-26 11:56:10 +01:00
Laurent Destailleur
8c1f271356
Maxi debug of module leave requests.
2015-12-24 12:37:38 +01:00
Laurent Destailleur
74e8738ca7
Fix: if option to select thirdparties using a combo box after n chars
...
was on, it was no more possible to clear the filter.
2015-12-24 11:24:56 +01:00
Florian HENRY
9441d98890
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-23 14:01:16 +01:00
aspangaro
ec7cffd6a4
Merge remote-tracking branch 'Upstream/develop' into develop-a7
2015-12-22 07:11:10 +01:00
Laurent Destailleur
6b25439161
Fix vietnamesefont
2015-12-21 20:41:02 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Florian HENRY
8006baf592
ry
2015-12-21 13:09:22 +01:00
aspangaro
c7b25ec497
Review page init accountancy
2015-12-21 06:51:46 +01:00
Laurent Destailleur
1c1d176715
Fix statistics was reporting bad value
2015-12-19 19:39:42 +01:00
Laurent Destailleur
55e90c5676
Try to restore lost file
2015-12-19 18:35:17 +01:00
Laurent Destailleur
f5c5dfd37f
FIX #4185
2015-12-19 18:26:15 +01:00
Laurent Destailleur
a4edd90320
Debug the cron module
2015-12-19 03:27:55 +01:00
Laurent Destailleur
a973c91c24
Fix pagination on cron jobs
...
Fix perf when too much lines
2015-12-19 02:39:44 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
dc9c5ed5ef
Enhance transifex sync
2015-12-18 18:25:09 +01:00
Laurent Destailleur
724817b966
Merge pull request #4259 from aschio/develop_sunimport
...
Adding extrafields to shipments module
2015-12-18 17:28:35 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
cla
cb96618460
Merge branch 'develop' into develop_sunimport
2015-12-18 10:49:57 +01:00
Laurent Destailleur
b10f9d4ca3
Fix: when doing an export of extrafields, we must use different table
...
alias for each extrafield table.
2015-12-17 20:40:33 +01:00
cla
1ebe6fb9b5
UPDATE:
...
sendings EN_US lang file
2015-12-16 16:21:05 +01:00
Laurent Destailleur
90dbfc4870
Fix: to avoid confusion between amount of payment and amount distributed
...
on invoice when a payment is done for several invoices, export of
payment can export both fields.
2015-12-15 15:52:20 +01:00
BENKE Charlie
23e727048e
Add some new translations for export feature
2015-12-15 10:35:11 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
3680202c1c
Fix do not share color for title of table and title of pages
2015-12-13 14:39:12 +01:00
aspangaro
c3acee56e2
Fix #3879 Wrong translation in the new expense report module
2015-12-12 10:06:11 +01:00
Frédéric FRANCE
5f0c7b6c38
Update paypal.lang
2015-12-10 16:31:11 +01:00
Laurent Destailleur
2aca50f7f8
Removed useless string
2015-12-06 13:56:15 +01:00
Laurent Destailleur
9c227d154e
Clean duplicate translation key
2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c
Enhance script to track duplicate translation string and use it to
...
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
0279e99b0a
Update warning for mysql 5.5.4* bug
2015-12-06 12:04:34 +01:00
Laurent Destailleur
e002021d7d
Fix td balance
2015-12-05 17:49:08 +01:00
Laurent Destailleur
e6ebc9c293
More complete tooltip help
2015-12-04 12:24:36 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
540609d5ed
Merge pull request #4139 from bafbes/patch-9
...
Update products.lang - include translation for units key in product/card.php
2015-12-03 12:01:10 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Bahfir Abbes
7841c97387
Update products.lang
2015-12-02 19:34:02 +01:00
Bahfir Abbes
134adcf637
Update products.lang
2015-12-02 18:55:51 +01:00
Laurent Destailleur
6df4948a73
Fix text
2015-12-01 03:12:12 +01:00
Laurent Destailleur
357bc7a00c
Fix color link
2015-11-30 21:40:14 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
480623a6d5
Uniformize GUI. All lists must have a search on status at end and last
...
column is dedicaded to future "mass action checkbox".
2015-11-29 13:03:46 +01:00
Laurent Destailleur
5df193ec93
Uniformize code
2015-11-28 20:25:50 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
aspangaro
9817ce8b20
Merge remote-tracking branch 'Upstream/develop' into develop-skype
2015-11-26 07:12:04 +01:00
aspangaro
9a2259c681
Correct button 'Export' and 'Write bookkeeping' on finance journal
2015-11-26 06:19:24 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
bc6d04e495
Typo
2015-11-26 00:08:34 +01:00
Laurent Destailleur
f79aeeeb0b
Merge pull request #4068 from aspangaro/develop-accountancy
...
Fix: typo on finance journal
2015-11-25 23:33:29 +01:00
aspangaro
3457a732f5
New: Better integration of skype
2015-11-25 20:19:18 +01:00
Raphaël Doursenaud
91ce70a6e9
FIX #4081 Added missing translation
2015-11-23 17:25:10 +01:00
aspangaro
0899e7392b
Fix: typo on finance journal
2015-11-22 22:11:22 +01:00
Laurent Destailleur
ffeae34f51
Update doc
2015-11-22 18:41:35 +01:00
Laurent Destailleur
73bcc3bfe3
The temp dir for cache used by rester is correctly managed: No temp or
...
data files must be stored outside of documents directory.
2015-11-22 17:39:13 +01:00
Laurent Destailleur
3aa25cd2be
Merge pull request #4064 from frederic34/escpos
...
Add profile escpos printer
2015-11-22 17:09:15 +01:00
Laurent Destailleur
91f1acd1f1
Merge pull request #4063 from grandoc/develop
...
fix : Typo and translation
2015-11-22 17:07:22 +01:00
frederic34
6b4b70bdbb
translations and help
2015-11-22 14:11:33 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
philippe grand
f4c8b5e7f8
missing translation
2015-11-22 10:46:17 +01:00
philippe grand
210c6c67cd
better translation and missing translation
2015-11-22 10:40:04 +01:00
philippe grand
9cdf0f427e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-22 10:15:57 +01:00
Laurent Destailleur
e3c6e4ebe5
NEW Add planned workload and declared progress on project summary list
...
on project home page (data aggregated from tasks of project)
2015-11-21 20:00:38 +01:00
philippe grand
0408e309f8
fix : Typo and translation
2015-11-21 19:13:34 +01:00
Laurent Destailleur
9db71098ac
Merge pull request #4031 from FHenry/develop
...
PG SQL
2015-11-21 01:50:47 +01:00
Laurent Destailleur
a906774595
Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
...
NEW 3.9 add billed status for supplier order
2015-11-21 00:20:17 +01:00
Florian HENRY
b8cab9f4d9
continue extrafeild $ID$ and SELECT feature
2015-11-20 13:51:57 +01:00
Florian HENRY
1566be35a1
NEW : add $ID$ into extrafields management to allow use current object
...
id on filter for select list from table and checkbox list from table
2015-11-20 11:59:28 +01:00
aspangaro
a5ca6cb732
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-17 20:34:37 +01:00
fappels
e9be3d19f4
Fix migration - remove default for text field
...
remove default for user_param value text field
lang typo
2015-11-16 21:24:08 +01:00
Alexis Algoud
55b23c4918
FIX add billed field in supplier order
2015-11-16 14:55:46 +01:00
Laurent Destailleur
dfc01e971f
Update files for transifex sync
2015-11-15 20:27:43 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
db941d5395
NEW Enhance style engine. Add option to set color of links
2015-11-15 11:31:09 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +01:00
aspangaro
0f75d76296
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-13 07:52:44 +01:00
Laurent Destailleur
471bcdd29f
Remove hard coded list of permissions.
2015-11-13 02:21:27 +01:00
aspangaro
30c4f1c896
HRM : language
2015-11-12 07:40:46 +01:00
aspangaro
7693b407e8
HRM: Begin to work on employee card
2015-11-12 06:59:40 +01:00
aspangaro
4ce6287d52
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-12 05:51:12 +01:00
aspangaro
f602e1fba7
HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple)
2015-11-12 05:48:56 +01:00
Laurent Destailleur
2bd0f04d8f
Add feature to get nb of top menu entrie
...
Fix translation of units
2015-11-12 00:48:37 +01:00
frederic34
cd738ef483
Merge remote branch 'upstream/develop' into fccard
...
Conflicts:
htdocs/commande/card.php
2015-11-11 17:23:37 +01:00
frederic34
b8a84d68ec
add messages
2015-11-09 18:19:10 +01:00
Laurent Destailleur
096ec3100d
Merge pull request #3926 from frederic34/fccard
...
allow chaining and remove header exit
2015-11-08 15:49:33 +01:00
Laurent Destailleur
350ef610e9
Fix beluga pdf for projects. Add missing expense reports.
2015-11-07 12:36:34 +01:00
frederic34
7349862b64
translations
2015-11-07 11:19:31 +01:00
Laurent Destailleur
f9d0c887ae
NEW Add a refresh button on page list of direct print jobs.
2015-11-06 02:20:42 +01:00
Laurent Destailleur
2dc644da30
Debug Direct print module using the OAuth setup.
2015-11-06 01:33:49 +01:00
Alexis Algoud
8221817087
NEW add an option to use standard ISO location for bill in crabe model
...
For electronic sending solutions, it could be required
2015-11-05 16:17:09 +01:00
philippe grand
b9c0cd316f
[Qual] Fix : TODO:translate
2015-11-05 11:11:51 +01:00
Laurent Destailleur
41ccfc411a
Better error message
2015-11-05 10:11:39 +01:00
Laurent Destailleur
1f4481a6b0
Merge pull request #3172 from atm-maxime/new_creditnote
...
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
2015-11-05 02:45:15 +01:00
Laurent Destailleur
11b7d8a44c
Merge pull request #3873 from frederic34/escpos
...
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
Laurent Destailleur
e26940ddf7
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
frederic34
644a104d5f
start to parse template
2015-11-04 23:14:50 +01:00
frederic34
d362d889f6
wip
2015-11-03 20:50:01 +01:00
Laurent Destailleur
cd68ea9d0f
Fix: We must use external URL for OAuth.
2015-11-02 21:42:11 +01:00
Laurent Destailleur
ffe1284a85
Merge pull request #3840 from frederic34/printgcp
...
Printing with Google Cloud Print
2015-11-02 20:09:13 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
055fe5e275
FIX #3786 Translation of select box.
2015-11-02 19:17:22 +01:00
Laurent Destailleur
bb26e1c195
Merge pull request #3860 from frederic34/patch-5
...
Update resource.lang
2015-11-02 18:06:31 +01:00
Frédéric FRANCE
76c89884ba
Update resource.lang
2015-11-02 17:32:02 +01:00
Frédéric FRANCE
ebf6493987
Typo
2015-11-02 17:31:03 +01:00
Laurent Destailleur
c119859696
NEW The quick search box on left menu can also search into expense
...
reports.
2015-11-02 13:14:46 +01:00
frederic34
9149032a03
Merge remote branch 'upstream/develop' into printgcp
...
Conflicts:
htdocs/core/actions_printing.inc.php
2015-11-02 11:43:34 +01:00
Laurent Destailleur
1a0179dd1f
More complete help
2015-11-02 11:08:36 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
Laurent Destailleur
a161e6d47a
Continue debug of PRODUIT_MULTIPRICES option.
...
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
2015-11-02 10:09:09 +01:00
frederic34
bb06a55844
Work on list jobs
2015-10-31 23:27:10 +01:00
Juanjo Menent
a58b5f26f6
Merge pull request #3774 from marcosgdf/multiprice-generator
...
NEW Level multiprice generator based on per cent variations over base price
2015-10-31 23:03:19 +01:00
frederic34
22d1cf860c
Add translation
2015-10-31 22:09:50 +01:00
frederic34
df3af6979e
Translation in paypal lib
2015-10-31 21:43:59 +01:00
Marcos García de La Fuente
e1f2efee4d
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-31 11:46:14 +01:00
frederic34
b6be372c4b
Merge remote branch 'upstream/develop' into printgcp
2015-10-30 18:12:34 +01:00
frederic34
1694c690ed
Printing with Google Cloud Print
2015-10-30 17:22:06 +01:00
Laurent Destailleur
6cc3df7e71
NEW Quick searh filter works on invoice, proposal, order, intervention,
...
contract
2015-10-30 08:35:56 +01:00
Juanjo Menent
de6bef82dd
Merge pull request #3820 from grandoc/develop
...
[Qual] Uniformize code
2015-10-29 10:54:36 +01:00
aspangaro
4e9d06785c
Fix #3818 & presentation
2015-10-29 06:47:42 +01:00
aspangaro
e2ba24826f
Review 3.8
2015-10-29 06:06:56 +01:00
Laurent Destailleur
4042c6d5cc
Minor fixes
2015-10-28 23:02:02 +01:00
Laurent Destailleur
f5eaeb2fb5
Some minor fixes
2015-10-28 22:51:06 +01:00
Laurent Destailleur
8e1fd5c3ed
Uniformize labels and css style
2015-10-28 22:25:15 +01:00
philippe grand
d517595f82
[Qual] Uniformize code
2015-10-28 19:28:18 +01:00
Juanjo Menent
a36559c55c
Merge pull request #3809 from aspangaro/develop-hrm
...
HRM module : continue to work
2015-10-28 16:11:17 +01:00
Laurent Destailleur
87c240252c
FIX Can export a field into task time table with export project profile
2015-10-27 22:24:18 +01:00
Laurent Destailleur
f9c9c58cba
Label must be cheque or transfer
2015-10-27 20:36:27 +01:00
Laurent Destailleur
fb28586f32
Better visible of what is possible for stock management
2015-10-27 19:18:22 +01:00
Marcos García de La Fuente
eff1f73950
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
# htdocs/product/price.php
2015-10-27 10:41:50 +01:00
aspangaro
93d340e497
HRM module : continue to work
2015-10-27 07:26:57 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Laurent Destailleur
6493438e87
NEW The clicktodial module is now able to provide link "tel:" on phone
...
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +01:00
Laurent Destailleur
d5e42478a9
Removed deprecated options to show or not forms. Such forms does not
...
exists anymore.
2015-10-26 12:37:36 +01:00
Laurent Destailleur
5c4ac0bf62
NEW Merge all left menu search boxes into one.
2015-10-26 12:18:22 +01:00
Maxime Kohlhaas
bd831b1f24
Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote
2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d
FIX The price per level just never correctly manage the vat. Vat is not
...
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
1b8234d9fe
Bette behaviour for blind people
2015-10-25 11:09:50 +01:00
Laurent Destailleur
082e41b6c0
Bette translation
2015-10-24 13:58:28 +02:00
Laurent Destailleur
633055fe5b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-22 19:44:00 +02:00
Laurent Destailleur
8df59134a9
Merge pull request #3705 from aspangaro/develop-hrm
...
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
531ef43a27
Some minor look fixes.
2015-10-22 19:13:16 +02:00
Laurent Destailleur
ce681081c1
Merge pull request #3776 from frederic34/patch-15
...
Set warehouse for order
2015-10-22 12:16:40 +02:00
Laurent Destailleur
b4c2fc7101
Merge pull request #3782 from frederic34/patch-17
...
Add draft suppliers orders in /comm/index
2015-10-22 10:42:07 +02:00
frederic34
865e9d9738
Merge remote branch 'upstream/develop' into patch-15
...
Conflicts:
htdocs/langs/en_US/admin.lang
2015-10-22 10:28:06 +02:00
Laurent Destailleur
fd72b4a400
Work on the new selectArrayAjax widget
2015-10-21 20:43:11 +02:00
Laurent Destailleur
9a1ec900bd
NEW Add into about page, a sample text to use to promote new version
...
release (visible only if version is last stable)
2015-10-21 00:31:32 +02:00
Frédéric FRANCE
15733f5ed0
Update propal.lang
2015-10-20 18:23:30 +02:00
Frédéric FRANCE
be85943d13
Update orders.lang
2015-10-20 18:21:28 +02:00
Frédéric FRANCE
506b251f24
Update orders.lang
2015-10-20 17:02:04 +02:00
Laurent Destailleur
0c6441df74
FIX Using extrafield with type "Link to object" works correctly.
2015-10-20 12:40:37 +02:00
Frédéric FRANCE
3e730cc9e2
Update admin.lang
2015-10-19 22:01:30 +02:00
Laurent Destailleur
7d382f7997
FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES
...
into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED
for better compatibility with old versions
2015-10-19 18:17:19 +02:00
Marcos García de La Fuente
e7e152c122
NEW Level multiprice generator based on per cent variations over base price
2015-10-19 15:13:19 +02:00
Laurent Destailleur
b9001d7ab8
NEW Prepare database to store information per files (for example to
...
define if an image ca, be used as a cover or not)
2015-10-18 22:43:19 +02:00
aspangaro
aac88519de
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
...
Conflicts:
htdocs/user/card.php
2015-10-17 07:19:46 +02:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
537a13e2f4
NEW Show which fields are used for search when doing a generic search
...
from the quick search form.
2015-10-17 00:14:36 +02:00
Laurent Destailleur
45a2156d71
Uniformize code and add more fields selectable for list of thirdparties
2015-10-16 23:03:20 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
aspangaro
0b54cc4509
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-10-11 21:05:15 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
aspangaro
8e37da55c3
Add searchform, language key and correct code
2015-10-10 08:34:15 +02:00
aspangaro
11387a5d38
Add language file
2015-10-10 06:37:43 +02:00
Laurent Destailleur
8db83a51b2
Missing translation
2015-10-07 14:30:54 +02:00
Laurent Destailleur
4b103ba8ce
Work on a better way to manage modules. All one page. Introduce a way to
...
choose order of modules family. We should also be able to introduce
filters.
2015-10-07 08:13:23 +02:00
Laurent Destailleur
8d47a307bb
Better use of space
2015-10-06 21:52:42 +02:00
Laurent Destailleur
72cabe2fc3
More complete description of margin rules calculation
2015-10-06 19:27:48 +02:00
Laurent Destailleur
7b2fbdd638
FIX Can't change the admin with default setup
2015-10-05 10:04:34 +02:00
Laurent Destailleur
68d4a9fc63
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-10-04 20:46:17 +02:00
Laurent Destailleur
77218194c6
Merge pull request #3657 from frederic34/patch-16
...
Fix : #3552
2015-10-04 19:56:22 +02:00
Frédéric FRANCE
b3fb320796
Update errors.lang
2015-10-03 23:44:17 +02:00
Juanjo Menent
92f4c0d015
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
2015-10-03 16:01:24 +02:00
Juanjo Menent
d1a52119e4
Merge pull request #3642 from frederic34/patch-11
...
Update suppliers.lang
2015-10-03 15:56:35 +02:00
Juanjo Menent
67d28d6991
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Laurent Destailleur
a9e55fd08f
FIX Missing contracts into list in page of Refering objects of a
...
thirdparty.
2015-10-03 12:57:58 +02:00
Frédéric FRANCE
17f6e5e48c
Update suppliers.lang
2015-10-02 16:07:56 +02:00
Laurent Destailleur
f11fd22809
More accurate message
2015-10-01 22:27:02 +02:00
Laurent Destailleur
4201e8b032
FIX #3630 - Wrong balance report when module salaries and donation
...
disabled
2015-10-01 14:38:31 +02:00
Laurent Destailleur
b57c156b60
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modContrat.class.php
htdocs/fichinter/card.php
htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Laurent Destailleur
9c4a12b9d4
Merge pull request #3613 from aspangaro/develop-68
...
Fix : remove viewport for mobile device already declared
2015-10-01 10:29:39 +02:00
Laurent Destailleur
9901406634
A paswword can be set on member card but member can't login. Too much
...
work to fix this into a stable version, so I just introduce a warning to
explain why and how to solve this.
2015-10-01 10:15:07 +02:00
Laurent Destailleur
d59f62cd75
Sync transifex
2015-09-30 01:25:35 +02:00
Laurent Destailleur
673ce059e6
Fix locale for nl_BE must match netherland language
2015-09-29 23:55:38 +02:00
Laurent Destailleur
1108656d19
NEW Can set color of the highlight hover line
2015-09-29 15:58:24 +02:00
Laurent Destailleur
60c6510fc1
NEW Can set default value of event type when creating an event (if type
...
of event option is used).
2015-09-29 14:17:03 +02:00
aspangaro
0b266a8ee5
Fix : remove viewport for mobile device already declared
2015-09-27 14:15:09 +02:00
