Laurent Destailleur
|
803fe68061
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
|
2016-08-01 15:01:14 +02:00 |
|
Laurent Destailleur
|
49258db58d
|
NEW Option DOC_SHOW_FIRST_SALES_REP shows name of buyer or saler on PDF.
|
2016-08-01 14:20:41 +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 |
|
Laurent Destailleur
|
0414f09e48
|
Fix permissions
|
2016-07-30 21:09:30 +02:00 |
|
Laurent Destailleur
|
ceb6199e87
|
Fix default numbering module of customer code was not enabled.
|
2016-07-30 12:31:32 +02:00 |
|
Laurent Destailleur
|
45d354ad82
|
Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN...
|
2016-07-29 22:58:39 +02:00 |
|
Laurent Destailleur
|
eafaa6f4dd
|
Fix doxygen
|
2016-07-29 17:30:33 +02:00 |
|
Laurent Destailleur
|
b85bb8c0f8
|
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
|
2016-07-29 16:24:02 +02:00 |
|
Laurent Destailleur
|
27243069cb
|
FIX #5535 bad dependency.
Conflicts:
htdocs/fourn/facture/list.php
|
2016-07-29 15:19:04 +02:00 |
|
Sergio Sanchis Climent
|
2a4afb8195
|
FIX Notice: Trying to get property of non-object when update 3.9 -> 4.0
|
2016-07-29 15:13:12 +02:00 |
|
Laurent Destailleur
|
5d97ce038b
|
Fix page break when using a large html footer.
|
2016-07-28 23:58:13 +02:00 |
|
florian HENRY
|
7b72965315
|
FIX incoterms
|
2016-07-28 16:48:16 +02:00 |
|
florian HENRY
|
c13c15188b
|
FIX: incoterms do not output into crabe invoice PDF
|
2016-07-28 16:44:08 +02:00 |
|
Laurent Destailleur
|
f54946bacb
|
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
|
2016-07-28 10:10:58 +02:00 |
|
Laurent Destailleur
|
889b15689b
|
FIX #5510
|
2016-07-27 19:42:09 +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
|
799226728d
|
Fix default rule for margin is choice 3: so cost price, then pmp if not
defined, then bestu supplier price if not defined
|
2016-07-27 18:05:44 +02:00 |
|
Laurent Destailleur
|
c23fe43b62
|
Merge pull request #5556 from olsesacl/#5516
FIX #5516 PHP7 warning on supplier module's invoices configuration page
|
2016-07-27 11:15:21 +02:00 |
|
Laurent Destailleur
|
198adcf440
|
Merge pull request #5555 from olsesacl/#5515
FIX #5515 PHP7 warnings on project module's configuration page
|
2016-07-27 11:14:50 +02:00 |
|
Laurent Destailleur
|
51566970ce
|
Merge pull request #5554 from olsesacl/#5514
FIX #5514 PHP7 Warning on barcode module's configuration page
|
2016-07-27 11:13:49 +02:00 |
|
Sergio Sanchis Climent
|
227c6906a8
|
FIX #5516
|
2016-07-26 23:26:29 +02:00 |
|
Sergio Sanchis Climent
|
3b57727542
|
PHP7 warnings on project module's configuration page
|
2016-07-26 22:22:55 +02:00 |
|
Sergio Sanchis Climent
|
c9fa12a8f9
|
PHP7 Warning on barcode module's configuration page
|
2016-07-26 22:09:06 +02:00 |
|
Sergio Sanchis Climent
|
7eed738fce
|
Fix: Accessing Direct Printing Jobs clears left menu
|
2016-07-26 21:53:03 +02:00 |
|
Laurent Destailleur
|
6d0ebbc4a3
|
Merge pull request #5424 from atm-florian/dev_fix5353
NEW #5353 IBAN and BIC should be now always mandatory for all country regarding accounting managment
|
2016-07-26 15:57:56 +02:00 |
|
Laurent Destailleur
|
a1c959e9d6
|
Merge pull request #5536 from defrance/patch-17
NEW add edition feature on action/agenda element
|
2016-07-26 15:29:45 +02:00 |
|
Laurent Destailleur
|
a3d0c01b68
|
Fix warning
|
2016-07-26 13:51:13 +02:00 |
|
florian HENRY
|
419dd3095b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
|
2016-07-26 08:59:40 +02:00 |
|
BENKE Charlie
|
e948002353
|
New : edition feature on action/agenda
|
2016-07-25 11:21:00 +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
|
1624894346
|
Fix missing load
|
2016-07-21 19:35:45 +02:00 |
|
Laurent Destailleur
|
058c431483
|
FIX The project was lost when creating the event "sent by email". Also,
event company "create" was not tracked by default like others.
|
2016-07-21 13:49:10 +02:00 |
|
Laurent Destailleur
|
adc9c28369
|
Merge pull request #5336 from atm-gauthier/develop_new_add_dorade_model
New: Develop new add dorade model
|
2016-07-20 18:31:47 +02:00 |
|
Laurent Destailleur
|
e2a03d18dd
|
Merge remote-tracking branch 'origin/4.0' into develop
|
2016-07-16 19:58:36 +02:00 |
|
Laurent Destailleur
|
553981426e
|
Several minor fixes in expense reports
|
2016-07-16 15:21:38 +02:00 |
|
Laurent Destailleur
|
68227d91d9
|
FIX after enabling module expense report, the document template is not
active by default.
|
2016-07-16 14:14:28 +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
|
9512bf1ac7
|
Add phpunit tests for option USE_STRICT_CSV_RULES
|
2016-07-15 12:30:24 +02:00 |
|
Laurent Destailleur
|
f7f812e11c
|
Merge pull request #5269 from defrance/patch-5
NEW Add option to generate strict CSV. Currently if \n or \r we replaced chars, now we can addquote too
|
2016-07-15 11:27:02 +02:00 |
|
Laurent Destailleur
|
3722274029
|
Merge pull request #5317 from atm-gauthier/develop_add_restrictions_on_exports
Develop add restrictions on exports
|
2016-07-14 20:08:59 +02:00 |
|
Laurent Destailleur
|
a5123c06db
|
Save the virtualhost so we can test without entering it each time.
|
2016-07-14 19:42:04 +02:00 |
|
Laurent Destailleur
|
490336b2e8
|
Fix bad dependency.
|
2016-07-12 20:07:53 +02:00 |
|
Laurent Destailleur
|
56e374ff0d
|
Fix remove warnings
|
2016-07-07 15:41:11 +02:00 |
|
florian HENRY
|
1bb28648c4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353
Conflicts:
build/pad/DoliWamp.pml
build/pad/Dolibarr.pml
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
|
2016-07-07 09:05:13 +02:00 |
|
Laurent Destailleur
|
061ccadd03
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/commande/list.php
htdocs/fourn/commande/orderstoinvoice.php
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
htdocs/install/pgsql/functions/functions.sql
|
2016-07-06 15:11:29 +02:00 |
|
Laurent Destailleur
|
a8f06d78b1
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/install/pgsql/functions/functions.sql
|
2016-07-06 14:53:05 +02:00 |
|
Maxime Kohlhaas
|
d658e2cf31
|
FIX task ODT company object not correctly retrieved
|
2016-07-05 16:04:18 +02:00 |
|
florian HENRY
|
1d96f5316e
|
travis
|
2016-07-05 15:14:28 +02:00 |
|
florian HENRY
|
afb924043f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353
Conflicts:
htdocs/core/modules/mailings/advthirdparties.modules.php
|
2016-07-04 20:43:14 +02:00 |
|
Laurent Destailleur
|
3d72f788b9
|
Fix phpcs
|
2016-07-02 18:02:39 +02:00 |
|
Laurent Destailleur
|
fe86ef5774
|
Thirdparty into keyword, encoded with convToOutputCharset
|
2016-07-02 17:00:45 +02:00 |
|
Laurent Destailleur
|
7d9671f6d3
|
Fix bad separator in url
|
2016-07-02 11:44:46 +02:00 |
|
Laurent Destailleur
|
3eaf0bc4bf
|
Fix bad translation
|
2016-07-02 11:32:06 +02:00 |
|
Laurent Destailleur
|
59f86a12d2
|
Fix delete of documents generated on project.
Fix missin translation
|
2016-07-01 17:49:13 +02:00 |
|
florian HENRY
|
9bbde79755
|
fix travis
|
2016-07-01 15:09:28 +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
|
625213580c
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/lib/pdf.lib.php
|
2016-07-01 03:17:20 +02:00 |
|
Laurent Destailleur
|
f3821c30f3
|
Merge pull request #5412 from atm-florian/dev_compta
Dev compta
|
2016-06-30 21:58:45 +02:00 |
|
florian HENRY
|
37ee64ae9b
|
fix 4672
|
2016-06-30 17:10:06 +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
|
22bc44620b
|
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
|
2016-06-30 14:27:58 +02:00 |
|
florian HENRY
|
ea3e851ec0
|
Fix stuff in accoutancy
|
2016-06-29 16:54:37 +02:00 |
|
Laurent Destailleur
|
9ebf7a1e35
|
Try to fix the group_concat function for pgsql.
|
2016-06-25 02:21:54 +02:00 |
|
Laurent Destailleur
|
2767df2e01
|
FIX Solve problem of sending joinded files of another email when several
tabs are opened on form to send emails.
|
2016-06-24 16:10:52 +02:00 |
|
gauthier
|
1233c44333
|
FIX : hidden configuration on pdf rouget for amount ht display to avoid using new model
|
2016-06-24 12:39:54 +02:00 |
|
Laurent Destailleur
|
453c6264bf
|
FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly
|
2016-06-24 02:19:41 +02:00 |
|
Laurent Destailleur
|
2e4c6597d8
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
|
2016-06-23 21:05:00 +02:00 |
|
Laurent Destailleur
|
f6119cfee8
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
|
2016-06-23 21:03:08 +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
|
00749b2a65
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/imports/import.php
htdocs/includes/odtphp/odf.php
htdocs/product/stock/product.php
htdocs/projet/list.php
|
2016-06-22 20:22:22 +02:00 |
|
florian HENRY
|
c34ef410e8
|
FIX php warning method declaration
|
2016-06-20 15:50:00 +02:00 |
|
Laurent Destailleur
|
386b19d4b1
|
Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore
old behaviour.
|
2016-06-19 17:56:34 +02:00 |
|
Laurent Destailleur
|
4382f2a437
|
Clean language files
|
2016-06-18 11:06:11 +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 |
|
gauthier
|
e6dabb0422
|
NEW : "dorade" expedition model with unit price ht and total ht
|
2016-06-10 12:02:57 +02:00 |
|
root
|
b3d58e9510
|
FIX large expense note
|
2016-06-08 14:36:52 +02:00 |
|
Laurent Destailleur
|
9019576394
|
Fix css class opacitymedium was not used everywhere.
|
2016-06-07 15:58:02 +02:00 |
|
gauthier
|
2aa688e6f2
|
NEW : tests for LEFT JOIN
|
2016-06-07 09:39:48 +02:00 |
|
gauthier
|
ff605a4cff
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_add_restrictions_on_exports
|
2016-06-06 17:51:51 +02:00 |
|
gauthier
|
a2df6dc59f
|
NEW : add restrictions on standard exports (agenda, order, deplacement, facture, fournisseur)
|
2016-06-06 17:51:39 +02:00 |
|
gauthier
|
85740a618e
|
NEW : add restrictions on standard exports (societe, propal, expedition)
|
2016-06-06 16:21:05 +02:00 |
|
Laurent Destailleur
|
47308d27c3
|
Missing column import_key and import for vat payments
|
2016-06-06 14:37:06 +02:00 |
|
Laurent Destailleur
|
1f93425193
|
Merge pull request #5308 from atm-maxime/develop
FIX #5044
|
2016-06-06 13:35:59 +02:00 |
|
Laurent Destailleur
|
52fefc2d02
|
Debug module resource
|
2016-06-06 13:14:05 +02:00 |
|
Maxime Kohlhaas
|
caaffdb0c3
|
FIX #5044
|
2016-06-05 02:54:25 +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 |
|
BENKE Charlie
|
7cd8e270cc
|
Update export_csv.modules.php
|
2016-06-04 19:25:32 +02:00 |
|
BENKE Charlie
|
2f36611cad
|
Update export_csv.modules.php
|
2016-06-04 19:22:15 +02:00 |
|
phf
|
c62a69ccc8
|
Merge branch 'fix_3.7_issue_2858' into develop
|
2016-06-04 18:54:55 +02:00 |
|
phf
|
3cbbdf5e20
|
Fix #2858
|
2016-06-04 18:23:22 +02:00 |
|
phf
|
01b881a0a6
|
Fix builddoc with odt lost value of extrafields as "sellist" on view card
|
2016-06-04 13:24:42 +02:00 |
|
Maxime Kohlhaas
|
857454a28d
|
For each module, no default permission on activation
|
2016-06-04 12:16:30 +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
|
085fa6902b
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
|
2016-06-04 00:58:16 +02:00 |
|
BENKE Charlie
|
2a8f17bc40
|
Update export_csv.modules.php
|
2016-06-03 23:58:37 +02:00 |
|
BENKE Charlie
|
41856a920e
|
if \n or \r we addquote too
|
2016-06-03 23:41:32 +02:00 |
|
Laurent Destailleur
|
537c9637f6
|
Merge pull request #5255 from atm-florian/dev_fix5151
FIX: #5151
|
2016-06-02 10:05:02 +02:00 |
|
Laurent Destailleur
|
028ff5e84c
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
|
2016-06-01 17:59:50 +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 |
|
Florian HENRY
|
ed05321438
|
comment don't need to be updated
|
2016-05-31 23:24:35 +02:00 |
|
Florian HENRY
|
3c42a32690
|
FIX: #5151
|
2016-05-31 23:22:15 +02:00 |
|
Laurent Destailleur
|
ed148f70b3
|
FIX Filter on assigned to was preselected on current user on list "All
events" (instead of no filtering)
|
2016-05-30 18:12:27 +02:00 |
|
Laurent Destailleur
|
3ddf427ff1
|
FIX Legal issue for GB. Add hidden option for this.
|
2016-05-30 00:52:16 +02:00 |
|
gauthier
|
1ce91bac06
|
FIX : same page added several times on mergepropal option
|
2016-05-25 11:25:19 +02:00 |
|
Laurent Destailleur
|
b476153b8b
|
Move POS at end of top menu
|
2016-05-25 00:02:48 +02:00 |
|
Laurent Destailleur
|
7935967c62
|
Fix duplicate translation key
|
2016-05-21 12:30:58 +02:00 |
|
Laurent Destailleur
|
b1bd6b5d6e
|
Fix regression
|
2016-05-18 18:23:38 +02:00 |
|
Laurent Destailleur
|
cf8c180fa4
|
Fix perm and CRLF
|
2016-05-18 16:26:15 +02:00 |
|
Laurent Destailleur
|
f3cd4b3ee8
|
Fix doxygen
|
2016-05-18 14:43:56 +02:00 |
|
florian HENRY
|
4e98f57385
|
FIX : php strict warning
|
2016-05-17 09:02:22 +02:00 |
|
Laurent Destailleur
|
55e904bc01
|
Debug for expert accounting module
|
2016-05-12 20:45:05 +02:00 |
|
Laurent Destailleur
|
c8d98dbfdc
|
FIX error reported by scrutinizer
|
2016-05-08 11:33:46 +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
|
d50e9cde34
|
Merge pull request #5090 from atm-maxime/fix_pdffoot_details
PDF foot details
|
2016-05-05 21:09:46 +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
|
7749425468
|
Modify right to access on chart of accounts
|
2016-05-02 20:02:45 +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 |
|
Laurent Destailleur
|
b434dad21a
|
Fix: remove a debug code
|
2016-04-29 18:34:56 +02:00 |
|
Laurent Destailleur
|
cea1c06f7d
|
Merge pull request #4764 from benlo06/fr_4763
FR4763 add possibility to export contacts/thirdparty categories
|
2016-04-29 18:33:58 +02:00 |
|
Sergio Sanchis Climent
|
61fda99fc5
|
FIX Bug insert cronjobs in modules, default values
|
2016-04-29 01:13:10 +02:00 |
|
Maxime Kohlhaas
|
02aa3f5688
|
Debug double conf
|
2016-04-24 12:14:03 +02:00 |
|
Maxime Kohlhaas
|
651213123f
|
Oups missing $conf
|
2016-04-23 17:45:38 +02:00 |
|
Maxime Kohlhaas
|
930b4a9be0
|
New var name
|
2016-04-23 17:36:55 +02:00 |
|
Maxime Kohlhaas
|
ad26fb2824
|
New option to show details in pdf page foot
|
2016-04-23 17:23:44 +02:00 |
|
Laurent Destailleur
|
5bfc65676c
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
|
2016-04-22 21:02:20 +02:00 |
|
Laurent Destailleur
|
7e047ada2b
|
Merge pull request #5064 from aspangaro/4.0-p21
FIX: Accountancy - Road to stable version
|
2016-04-22 19:21:18 +02:00 |
|
Laurent Destailleur
|
63d04f4f2d
|
Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client
Fix order creation bug because of ->client
|
2016-04-22 19:20:48 +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
|
c939273fd5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-04-22 13:38:56 +02:00 |
|
Laurent Destailleur
|
78d18185e4
|
Several css enhancements
|
2016-04-22 11:11:08 +02:00 |
|
Laurent Destailleur
|
a10d97cce0
|
NEW Can filter on status employee when building emailing from users
|
2016-04-22 11:09:31 +02:00 |
|
Maxime Kohlhaas
|
e881701968
|
Fix pdf generation with thirdparty
|
2016-04-22 09:46:47 +02:00 |
|
aspangaro
|
24fddaa039
|
Hidden old functions
|
2016-04-22 06:58:18 +02:00 |
|
Frédéric FRANCE
|
fd9fb505b9
|
Update printgcp.modules.php
|
2016-04-21 07:53:22 +02:00 |
|
Frédéric FRANCE
|
e1d55d280e
|
Update printgcp.modules.php
|
2016-04-20 22:29:27 +02:00 |
|
Fixit Management
|
c3a5a7aab8
|
Rollback modification in this file
|
2016-04-19 12:54:46 +02:00 |
|
Fixit Management
|
ee9f1f32c1
|
Update conf
|
2016-04-19 12:43:50 +02:00 |
|
Fixit Management
|
5778ba0bd8
|
Merge remote-tracking branch 'upstream/develop' into fr_4763
|
2016-04-19 12:31:05 +02:00 |
|
Marcos García de La Fuente
|
e2c86d3fd8
|
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
|
2016-04-17 15:24:22 +02:00 |
|
Juanjo Menent
|
b5f7f962cc
|
FIX Travis fails
|
2016-04-15 16:05:47 +02:00 |
|
Laurent Destailleur
|
8d46d76f96
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/facture/paiement.php
|
2016-04-12 15:05:18 +02:00 |
|
Laurent Destailleur
|
357877b1fe
|
Debug multicurrency and clean properties of some modules
|
2016-04-12 14:45:59 +02:00 |
|
Laurent Destailleur
|
b60e90a7b7
|
NEW A module can add, into its import profiles, a sql request to execute
at end of import. This allow to update dernormalized data after import.
|
2016-04-11 18:08:03 +02:00 |
|
Laurent Destailleur
|
3678e05270
|
Mutualize code by moving getter into parent class.
|
2016-04-11 16:36:00 +02:00 |
|
Laurent Destailleur
|
03f43d7c55
|
Removed a TODO by moving detection of line of records of a file to
import into the import driver.
|
2016-04-11 15:19:58 +02:00 |
|
Laurent Destailleur
|
0e7fb80a34
|
FIX: We should be able to import value '0'
|
2016-04-11 14:56:42 +02:00 |
|
Laurent Destailleur
|
695cccca1c
|
Import wizard accept both id or ref into imported fields. But if the ref
is numeric, there is no way to know if it is a ref or id. So i introduct
support of syntax id: or ref: into value of field to import to force
type.
|
2016-04-11 14:44:14 +02:00 |
|
Laurent Destailleur
|
b16d9a88d5
|
Fix regression after renaming vars
|
2016-04-09 19:03:34 +02:00 |
|
Laurent Destailleur
|
83644dcb93
|
Fix errors reported by scrutinizer
|
2016-04-09 15:38:15 +02:00 |
|