BENKE Charlie
16770d3d3f
Update doc_generic_task_odt.modules.php
2016-01-04 15:08:08 +01:00
BENKE Charlie
0d2a6a9868
Update doc_generic_project_odt.modules.php
2016-01-04 15:07:42 +01:00
BENKE Charlie
522f17e6f9
Update doc_generic_invoice_odt.modules.php
2016-01-04 15:07:17 +01:00
BENKE Charlie
11bef2d044
Update doc_generic_shipment_odt.modules.php
2016-01-04 15:06:50 +01:00
BENKE Charlie
99f3df6128
Update doc_generic_order_odt.modules.php
2016-01-04 15:06:28 +01:00
BENKE Charlie
2f56df4899
Update doc_generic_odt.modules.php
2016-01-04 15:03:05 +01:00
BENKE Charlie
a4d24a04a7
Update doc_generic_proposal_odt.modules.php
2016-01-04 15:00:46 +01:00
BENKE Charlie
b308baaf27
Update doc_generic_task_odt.modules.php
2016-01-04 14:58:57 +01:00
BENKE Charlie
f4953a3a6e
Update doc_generic_project_odt.modules.php
2016-01-04 14:55:53 +01:00
BENKE Charlie
e41fe61ab0
Update doc_generic_invoice_odt.modules.php
2016-01-04 14:53:28 +01:00
BENKE Charlie
88912b29d9
Update doc_generic_shipment_odt.modules.php
2016-01-04 14:51:15 +01:00
BENKE Charlie
66834df34c
Update doc_generic_order_odt.modules.php
2016-01-04 14:47:47 +01:00
BENKE Charlie
768ef73f49
Parameters harmonization of hook execute call
2016-01-04 14:43:38 +01:00
Laurent Destailleur
1e1d6d4955
Fix to be able to use dolibarr with a smartphone
2016-01-03 19:34:19 +01:00
aspangaro
e0da56bcd0
Accountancy Add a list to select accounting account on donation admin
2015-12-26 05:56:14 +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
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
dd3f5a32d3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
2015-12-18 21:03:57 +01:00
Laurent Destailleur
dc8e5f45ae
Merge pull request #4254 from grandoc/develop
...
[Qual] Uniformize code
2015-12-18 17:13:22 +01:00
Laurent Destailleur
c328860af0
Merge pull request #4250 from GPCsolutions/dolibarr-4242
...
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:07:00 +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
philippe grand
367d9de0b7
fix some translation
2015-12-17 17:12:28 +01:00
Raphaël Doursenaud
4f9ab7da24
FIX #4242 Allow disabling dashes in documents
...
3.9 specific fix since document have moved
2015-12-17 10:39:55 +01:00
Raphaël Doursenaud
7e98cfd5b6
FIX #4242 Allow disabling dashes in documents
...
3.8 specific fix for new documents
2015-12-17 10:33:17 +01:00
Raphaël Doursenaud
02e053acc6
FIX #4242 Allow disabling dashes in documents
...
3.7 specific fix since document files have moved
2015-12-17 10:26:27 +01:00
Raphaël Doursenaud
e6ec797af8
FIX #4242 Allow disabling dashes in documents
2015-12-17 10:21:44 +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
Laurent Destailleur
40269c3c70
Fix Remove syntax warnings
2015-12-15 09:43:39 +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
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
2a6fbe3526
Fix debug shipment doc generation (bad position of fields, code
...
differences, text size, ...)
2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f
Fix: Color too dark
2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4
Fix: text too long
2015-12-12 14:12:53 +01:00
Raphaël Doursenaud
c0862762a5
Fix #3930 Removed executable bit
...
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Laurent Destailleur
2b149aa514
Merge pull request #4148 from AlainRnet/develop
...
Update fraise.modules.php
2015-12-04 10:31:34 +01:00
AlainRnet
ebc1105b5c
Update fraise.modules.php
...
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400 ) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
2015-12-03 21:09:09 +01:00
Romain DESCHAMPS
94101412e9
Progress column not wide enough for 100%
...
Progress column not wide enough for 100%
2015-11-30 12:20:14 +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
Laurent Destailleur
8746ee1310
Merge pull request #4067 from aspangaro/develop-donation
...
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
2015-11-25 23:33:13 +01:00
Laurent Destailleur
9d10533f3d
Merge pull request #4066 from aspangaro/develop-hrm
...
Fix: Auguria Menu & wrong table in dictionary HRM
2015-11-25 23:32:36 +01:00
aspangaro
3457a732f5
New: Better integration of skype
2015-11-25 20:19:18 +01:00
Laurent Destailleur
5568ff1c54
Fix bad picto on export
2015-11-25 16:41:40 +01:00
Laurent Destailleur
a1824955f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-23 12:21:02 +01:00
Laurent Destailleur
12358c9721
FIX The import help was not visible on calculated fields
2015-11-23 12:20:43 +01:00
Laurent Destailleur
61b46352b7
Dash line was not visible.
2015-11-23 09:36:34 +01:00
aspangaro
71189248d9
Correct description
2015-11-22 21:35:19 +01:00
aspangaro
5bed70b04e
New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
2015-11-22 21:31:05 +01:00
aspangaro
f9e82721d7
Fix: Auguria Menu & wrong table in dictionary HRM
2015-11-22 20:13:48 +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
296e04022f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-22 17:19:45 +01:00
Laurent Destailleur
99fa751edc
Test lib is available
2015-11-22 17:19:20 +01:00
Laurent Destailleur
3c55479705
Restler #3544
2015-11-22 17:17:06 +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
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
frederic34
bfd97d5226
Add profile escpos printer
2015-11-22 11:04:27 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Laurent Destailleur
758b8e1f7e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/boxes/box_project.php
2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-11-21 12:23:51 +01:00
arnaud
4233d24f4b
FIX export with category contact extrafields
2015-11-19 18:01:58 +01:00
aspangaro
ad457b416d
Use menu & add mode 'employee' in user/index.php
2015-11-17 22:51:34 +01:00
aspangaro
258ac45519
Remove obsolete code
2015-11-17 22:14:39 +01:00
aspangaro
a5ca6cb732
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-17 20:34:37 +01:00
Laurent Destailleur
f5631cac45
NEW Introduce property module_position so a module can decide where it
...
appears into list of modules.
2015-11-17 00:58:12 +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
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +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
arnaud
aaa6f00d11
FIX export propal and order with extrafields
2015-11-12 12:37:04 +01:00
aspangaro
30c4f1c896
HRM : language
2015-11-12 07:40:46 +01:00
aspangaro
bedba7ffb7
HRM: add a mode 'employee' for development to show tab
2015-11-12 07:26:51 +01:00
aspangaro
20872498ba
HRM: Add a tab for holiday module in employee card
2015-11-12 06:58:26 +01:00
Laurent Destailleur
350ef610e9
Fix beluga pdf for projects. Add missing expense reports.
2015-11-07 12:36:34 +01:00
philippe grand
5f74a0f1c0
Traduction
2015-11-06 09:46:18 +01:00
Laurent Destailleur
2dc644da30
Debug Direct print module using the OAuth setup.
2015-11-06 01:33:49 +01:00
Laurent Destailleur
e4bd99aaf3
Merge pull request #3904 from frederic34/printgcp
...
Google Cloud Print
2015-11-05 21:57:08 +01:00
Laurent Destailleur
a7cea65710
Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement
...
NEW add an option to use standard ISO location for bill in crabe model
2015-11-05 21:51:38 +01:00
Laurent Destailleur
f3b8df3ea5
Merge pull request #3889 from frederic34/escpos
...
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
3ef6a92bb1
Google Cloud Print
2015-11-05 18:04:00 +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
Laurent Destailleur
41ccfc411a
Better error message
2015-11-05 10:11:39 +01:00
frederic34
1a374ddd2c
Receipt Printer conf and lang
2015-11-05 08:42:03 +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
Laurent Destailleur
09f3cd6f1d
Fix class cant be abstract
2015-11-04 16:43:24 +01:00
frederic34
5c725aceb8
sql
2015-11-03 22:12:03 +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
1bcda200e3
A module to setup OAuth. OK, but what to do once setup of a client
...
id/secret is done ?
2015-11-02 20:48:27 +01:00
Laurent Destailleur
563a020595
NEW Free text for cheque deposit receipt can be HTML content.
2015-11-02 20:35:33 +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
67a2f6ee91
Merge pull request #3854 from fmarcet/3.8
...
FIX: Send emails to contacts who should not receive emails
2015-11-02 18:03:59 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
fmarcet
3c5903f75a
FIX: Contacts are not added to the list with the status "no contact"
2015-11-02 11:52:58 +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
aspangaro
6df524bcb0
Remove blank page
2015-11-01 22:54:04 +01:00
frederic34
b9367bb196
Errors management
2015-11-01 11:24:51 +01:00
frederic34
2b4224d4c4
List Jobs
2015-11-01 10:10:14 +01:00
frederic34
2f3e6958f9
Receipt Printer
2015-11-01 00:58:08 +01:00
frederic34
bb06a55844
Work on list jobs
2015-10-31 23:27:10 +01:00
frederic34
b6be372c4b
Merge remote branch 'upstream/develop' into printgcp
2015-10-30 18:12:34 +01:00
frederic34
e90f68906e
SQL tables for oauth
2015-10-30 17:59:45 +01:00
frederic34
1694c690ed
Printing with Google Cloud Print
2015-10-30 17:22:06 +01:00
Ferran Marcet
5862037d34
FIX Bad parameters
2015-10-30 13:03:34 +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
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
90a221ef6d
Fix version of module
2015-10-22 19:46:30 +02:00
aspangaro
8e37da55c3
Add searchform, language key and correct code
2015-10-10 08:34:15 +02:00
aspangaro
8f8de587b8
Add admin & first version to manage establishment
2015-10-10 06:39:59 +02:00
aspangaro
5d7e05e313
Correct review
2015-10-10 06:00:55 +02:00
aspangaro
f6947afc2f
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-10-10 05:42:06 +02:00
Laurent Destailleur
ab4b423567
Merge pull request #3712 from GPCsolutions/fixunittests
...
Fix unittests regression
2015-10-09 20:19:21 +02:00
Laurent Destailleur
796a87e254
Merge pull request #3673 from apachler/develop
...
Changes to ODT creation of proposal and invoice
2015-10-09 20:18:55 +02:00
Raphaël Doursenaud
b785db86a8
Fix unittests regression
...
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
2015-10-09 19:02:44 +02:00
aspangaro
d9693ba2f2
New : Module HRM
2015-10-09 06:16:43 +02:00
philippe grand
0e343ae3b2
syntax error
2015-10-08 09:34:02 +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
Andreas, OE8APR
3aeeab9654
Get proposal customer contact
...
Added functionality to get proposal customer contact as contact_xx tags
2015-10-05 17:51:26 +02:00
Andreas, OE8APR
e3bdc8aaaa
Get invoice customer contact
...
Added functionality to get invoice customer contact as contact_xx tags
2015-10-05 17:50:56 +02:00
Laurent Destailleur
85a5b0fc69
Merge pull request #3652 from grandoc/develop
...
FIX : typo
2015-10-04 19:57:12 +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
6f513fabef
Update DolibarrModules.class.php
2015-10-03 23:45:25 +02:00
Juanjo Menent
9d60dee781
Issue #3509 : Ready for customers
2015-10-03 17:15:25 +02:00
Juanjo Menent
03a2fd740d
Issue #3509 : Ready for customers
2015-10-03 16:58:46 +02:00
Juanjo Menent
92f4c0d015
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
2015-10-03 16:01:24 +02:00
philippe grand
298fafd7d2
fix : internationalization
2015-10-03 15:10:53 +02:00
philippe grand
b6de2a954c
fix : internationalization
2015-10-03 15:04:03 +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
philippe grand
82c7022e20
Fix : internationalization
2015-10-03 14:47:11 +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
e76124add5
FIX #3606
2015-10-01 16:09:51 +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
9c28894ec3
Merge pull request #3615 from FHenry/3.7
...
FIX : When delete actioncomm also delete actioncomm_resources
2015-10-01 10:34:54 +02:00
Florian HENRY
a96b92a618
FIX : Email selector contact must not include inactive contact
2015-09-30 14:06:45 +02:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
philippe
1454d942ef
missing translation
2015-09-27 11:06:45 +02:00
Laurent Destailleur
d119e04963
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-26 14:17:02 +02:00
Laurent Destailleur
9ecc8e5e6b
FIX Regression on bad use of fk_account showing the bad bank account on
...
PDF.
2015-09-26 14:11:39 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Laurent Destailleur
f3ba115ef0
Fix missing default value
2015-09-26 10:53:59 +02:00
Juanjo Menent
4fa1be0e35
Issue #3509 : Init works
2015-09-26 10:37:36 +02:00
Juanjo Menent
f14c806439
Merge branch 'develop' into dolibarr-3509
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-26 09:03:50 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
3feffdb84f
[Qual] Removed unused deprecated fields
2015-09-24 17:50:39 +02:00
Juanjo Menent
5dc78a337d
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
2015-09-23 22:49:23 +02:00
Juanjo Menent
342e3413db
Issue 3509: Init works
2015-09-23 22:48:48 +02:00
Laurent Destailleur
f81df66564
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
Laurent Destailleur
c2bdd9b465
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-22 11:29:49 +02:00
Laurent Destailleur
7d4a9b17b6
FIX Creation of tables or keys must not be done with a random order.
2015-09-21 14:00:02 +02:00
aspangaro
49f671eb1d
Correct name
2015-09-19 07:24:32 +02:00
aspangaro
1901b2fb3b
Missing translations in checks deposits exports
2015-09-19 07:15:13 +02:00
Laurent Destailleur
f01b9c09a3
Removed duplicate code. Use inheritance instead.
2015-09-18 10:36:23 +02:00
Laurent Destailleur
1b836dc31e
Merge pull request #3408 from aspangaro/develop-60
...
New: CkEditor add possibility to choose skin
2015-09-15 17:09:11 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
97096536b1
Fix #2526 The filter on type numeric is ok now. Sometimes we used
...
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
2015-09-12 15:20:55 +02:00
Laurent Destailleur
db1d9d6d8e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-09-12 11:50:46 +02:00
Laurent Destailleur
309e1604e1
Fix migration missing for leave request module
...
Fix permission label for expense report and leave request
2015-09-12 11:35:49 +02:00
Laurent Destailleur
24a216b154
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-09-12 11:33:49 +02:00
Laurent Destailleur
5e81eb7586
Merge pull request #3505 from GPCsolutions/firephp
...
Setup FirePHP like ChromePHP
2015-09-12 11:02:31 +02:00
Raphaël Doursenaud
fc91e553ad
Setup FirePHP like ChromePHP
2015-09-11 17:45:30 +02:00
Laurent Destailleur
4b97fae28f
Fix migration missing for leave request module
...
Fix permission label for expense report and leave request
2015-09-11 07:52:06 +02:00
Laurent Destailleur
7951483c5f
Fix: examples ko for import
...
Fix bad picto for export
2015-09-10 12:47:25 +02:00
Florian HENRY
6cb993c0b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-10 11:20:03 +02:00
aspangaro
3a90bfa6d3
Merge remote-tracking branch 'Upstream/develop' into develop-60
2015-09-10 06:59:23 +02:00
Laurent Destailleur
2234d95a7b
Merge pull request #3481 from grandoc/develop
...
translations missing
2015-09-09 20:52:36 +02:00
Laurent Destailleur
a726cd210b
Merge pull request #3483 from GPCsolutions/sentry
...
Fix regression introduced by f3c71a9a5a
2015-09-09 20:10:01 +02:00
Laurent Destailleur
8c1760fbcf
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-09-09 13:26:35 +02:00
Laurent Destailleur
d3f1a7d5b8
FIX Bad condition into invoice export request making reporting too many
...
rows.
2015-09-09 13:26:10 +02:00
Florian HENRY
89b723b2a7
FIX : multientity warehouse management
2015-09-08 16:23:00 +02:00
aspangaro
16585553c1
Merge remote-tracking branch 'Upstream/develop' into develop-64
2015-09-07 21:52:08 +02:00
aspangaro
46b0e259b1
Add constant in modAccounting.class.php
2015-09-07 21:51:48 +02:00
philippe grand
706f62d8f2
better display for code
2015-09-07 17:02:53 +02:00
Raphaël Doursenaud
1168f0b6ae
Fix regression introduced by f3c71a9a5a
2015-09-07 16:20:17 +02:00
philippe grand
ec21916d3b
translations missing
2015-09-07 15:55:26 +02:00
philippe grand
9532baf0e5
translations missing
2015-09-07 15:46:57 +02:00
philippe grand
887a4107a1
translations missing
2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714
translations missing
2015-09-07 15:29:51 +02:00
Laurent Destailleur
5d285bf56d
Merge pull request #3478 from grandoc/develop
...
translations missing
2015-09-07 15:09:31 +02:00
philippe grand
ff3968b07f
translations missing
2015-09-07 12:46:49 +02:00
Laurent Destailleur
28c62fb214
Introduce a function to return a warning by loggers.
2015-09-07 12:21:26 +02:00
Laurent Destailleur
f3c71a9a5a
Dolibarr must not contains autoload feature.
...
The developer and user must decide which lib is used and it must not be
a random feature that take a library "randomly" (first one found is same
a randomly found).
By default, library embedded of dolibarr must be used. If we want to use
another one, an option to set the path of external libray must be
available.
2015-09-07 12:09:42 +02:00
Laurent Destailleur
77ef046af4
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:02:21 +02:00
Laurent Destailleur
51c5e01290
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-09-05 00:48:56 +02:00
Laurent Destailleur
7926fd8083
NEW ODT generators can set meta properties of ODT file
2015-09-05 00:47:06 +02:00
Raphaël Doursenaud
7bb917e637
NEW Support logging to a Sentry server
...
Sentry is an Open Source error logging and aggregation platform.
It can be used on-premise or hosted at https://getsentry.com
2015-09-04 19:10:13 +02:00
Raphaël Doursenaud
11402debbd
Install ChromePHP from composer
2015-09-04 19:06:00 +02:00
Laurent Destailleur
dcaef54f9b
Fix can't disable a module that were removed.
2015-09-04 16:47:43 +02:00
Laurent Destailleur
d19ec89bf1
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Laurent Destailleur
2e3d25c055
Merge pull request #3462 from grandoc/3.7
...
fix : Typo
2015-09-03 19:15:31 +02:00
Laurent Destailleur
54214cfddf
Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-3383
Conflicts:
ChangeLog
2015-09-03 19:12:01 +02:00
philippe grand
8bf093a7ce
fix : Typo
2015-09-03 12:12:10 +02:00
Marcos García de La Fuente
67b7162c59
Merge branch '3.7' into bug-3383
...
# Conflicts:
# ChangeLog
2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29
Merge branch '3.7' into bug-incorrect-pdf-bank
...
# Conflicts:
# ChangeLog
2015-09-03 12:03:24 +02:00
Laurent Destailleur
19ac160696
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
2015-09-03 10:49:41 +02:00
Marcos García de La Fuente
3134950dbe
FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models
...
Close #3383
2015-09-01 11:19:05 +02:00
Marcos García de La Fuente
c4f9bde14d
FIX [ bug #3431 ] Invoice bank account is not respected
...
Close #3431
2015-09-01 11:09:37 +02:00
Raphaël Doursenaud
3b493ab0ed
Fix #2863 Sensible defaults for ChromePHP path
...
Use the provided ChromePHP class by default
2015-08-31 21:08:37 +02:00
Laurent Destailleur
302b61c5ce
Fix Can't download generated document for cheque summary deposit.
2015-08-27 22:43:09 +02:00
Juanjo Menent
ddb9c6a025
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-26 21:01:39 +02:00
Juanjo Menent
0a33f0728a
Fix translations of contract exports
2015-08-26 21:01:01 +02:00
Juanjo Menent
4cd61073e2
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-26 20:26:27 +02:00
Juanjo Menent
6321e96e49
Close #3223
2015-08-26 20:25:52 +02:00
Laurent Destailleur
603c44c37c
Merge pull request #3405 from aspangaro/3.8-13
...
Fast review 3.8
2015-08-26 11:27:16 +02:00
Juanjo Menent
9deaa3cceb
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-25 22:01:33 +02:00
Juanjo Menent
f32a7ba228
Close #3224
2015-08-25 21:59:46 +02:00
aspangaro
73d8f20c6b
Fix: Correct directory where the donation is generated & add the action to remove_file who are generated
2015-08-25 08:09:14 +02:00
Laurent Destailleur
feed3f714c
Fix to avoid warning
2015-08-24 11:17:11 +02:00
aspangaro
a6701aeb69
New: CkEditor add possibility to choose skin
2015-08-23 15:39:55 +02:00
Laurent Destailleur
1b409538a8
Fix #3400
...
Conflicts:
htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac
Fix #3400
2015-08-20 15:50:00 +02:00
Florian HENRY
91c8057d51
NEW : import Third parties/Sales representatives
2015-08-19 16:59:43 +02:00
Laurent Destailleur
fabd751be4
Fix Server hang with long loop when reading specimen pdf and high number
...
of tasks.
2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f
Fix translation
2015-08-17 19:42:19 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
f1e87478ff
Fix translation of printing menu
2015-08-12 23:12:15 +02:00
Laurent Destailleur
d4aabf99db
Fix permission of module
2015-08-12 22:32:29 +02:00
Juanjo Menent
a6d7977d4f
Merge pull request #3354 from defrance/patch-74
...
New pdf for project - listing of elements
2015-08-10 20:51:58 +02:00
Marcos García de La Fuente
f3ef4fed93
Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
...
Close #3313
2015-08-09 13:58:03 +02:00
Juanjo Menent
f695b5cd11
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-07 13:01:53 +02:00
Juanjo Menent
38afb1a4e6
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/modules/modBarcode.class.php
2015-08-07 12:57:16 +02:00
Juanjo Menent
12b83fd3e8
Fix #3304
2015-08-07 12:45:27 +02:00
BENKE Charlie
01671d02d1
New pdf for project - listing of elements
2015-08-07 00:39:44 +02:00
Juanjo Menent
98072ec73e
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-06 18:00:59 +02:00
Florian HENRY
2a7f5da4a7
FIX : export SQL instruction on modProduct with extrafields
2015-08-04 11:49:26 +02:00
Juanjo Menent
9ae31f3a08
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-01 15:01:19 +02:00
Juanjo Menent
05b0a9b675
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Laurent Destailleur
a6bac40f0a
Fix bad translation
2015-07-29 13:03:52 +02:00
Laurent Destailleur
ff8969073c
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/main.inc.php
2015-07-28 18:57:13 +02:00
fmarcet
6676114501
Fix: Not showing product supplier reference when page break
2015-07-27 16:31:40 +02:00
fmarcet
e130af8033
Fix: Not showing delivery date on rouget pdf (expedition)
2015-07-27 13:11:07 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
aspangaro
b9b6abd7a8
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-18 05:29:57 +02:00
Juanjo Menent
06684ea362
Merge pull request #3250 from aspangaro/3.8-patch7
...
Fix : #3228 [Export] Missing member ID field in users
2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531
Merge pull request #3249 from aspangaro/3.8-patch6
...
Fix : #3230 [Leaves] Module setup page is useless
2015-07-17 19:15:31 +02:00
aspangaro
a0d74cc1a1
Fix : #3228 [Export] Missing member ID field in users
2015-07-16 22:50:50 +02:00
aspangaro
440e144892
Fix : #3230 [Leaves] Module setup page is useless
2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0
Fix : #3232 [Agenda] Setup page tab order is weird
2015-07-16 22:16:11 +02:00
Laurent Destailleur
cbce66bba8
Merge pull request #3190 from hregis/3.8_bug2
...
Fix: wrong path and add index.html
2015-07-16 10:07:31 +02:00
