Frédéric FRANCE
423a69ffad
Update mod_ticket_universal.php
2019-02-13 23:44:06 +01:00
Frédéric FRANCE
210fb2eac1
Update mod_facture_mercure.php
2019-02-13 23:41:47 +01:00
Frédéric FRANCE
5c50ea8afe
Update mod_commande_fournisseur_orchidee.php
...
The property db does not exist on mod_commande_fournisseur_orchidee
2019-02-13 23:39:02 +01:00
Frédéric FRANCE
9370c8b3f6
Update mod_holiday_immaculate.php
2019-02-13 23:36:16 +01:00
Frédéric FRANCE
e0843e6130
Update modules_holiday.php
2019-02-13 23:35:44 +01:00
Laurent Destailleur
a689f8dc3f
Code comment
2019-02-13 23:34:28 +01:00
florian HENRY
d88475c61a
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
2019-02-13 08:59:18 +01:00
Laurent Destailleur
0d8447ad39
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
...
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
2019-02-12 16:58:55 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58: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
b1088f556f
Merge pull request #10536 from grandoc/new_branch_09_02_2019
...
language internationalization
2019-02-12 13:28:56 +01:00
Laurent Destailleur
a62bccaf24
Fix phpcs
2019-02-11 19:19:05 +01:00
Laurent Destailleur
f0e56abac7
NEW Module ticket is available as a stable module
2019-02-11 19:16:37 +01:00
Laurent Destailleur
c095f802dd
Dolibarrize module ticket
2019-02-11 14:51:59 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Philippe Grand
92ec149fb6
Update modules_fichinter.php
2019-02-09 11:05:52 +01:00
Philippe GRAND
869f59de96
language internationalization
2019-02-09 10:56:59 +01:00
Laurent Destailleur
7625eb7cd4
Fix missing error management after afterPDFCreation hook.
...
Removed dead code
2019-02-08 19:54:24 +01:00
Laurent Destailleur
a916708068
Fix missing disable dependency
2019-02-08 19:01:47 +01:00
Laurent Destailleur
ed733fb82d
Fix phpcs
2019-02-08 13:28:10 +01:00
Laurent Destailleur
8760b1e592
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-08 12:57:50 +01:00
Laurent Destailleur
27da574e38
Fix phpcs
2019-02-08 12:36:33 +01:00
Laurent Destailleur
1611c613f5
Fix phpcs
2019-02-08 12:19:51 +01:00
Laurent Destailleur
ec686a8f79
Fix phpcs
2019-02-08 11:30:20 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
6a4a92510d
Code comment
2019-02-07 13:32:05 +01:00
atm-ph
8e6a567b09
Fix display payment table on multiple pages
2019-02-07 12:36:22 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
f8b10e9c3d
Doxygen
2019-02-03 18:47:55 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
75845a990f
FIX Missing province in export of invoice
2019-02-01 22:55:28 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2019-02-01 16:01:18 +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
4254ad0d33
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700
FIX Missing field in import/export of users
2019-01-31 15:51:02 +01:00
gauthier
09ba059c21
FIX : need an order by in case we found other invoice with same number but not same date
2019-01-31 11:03:06 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
97248a830b
FIX #10440
2019-01-30 16:28:37 +01:00
Laurent Destailleur
6d992a6d7b
FIX #10440
2019-01-30 16:24:27 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Laurent Destailleur
c354656b1b
Merge pull request #10449 from ptibogxiv/patch-108
...
NEW : list of stripe's payout
2019-01-30 15:02:27 +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
84ecfd96fb
Update example
2019-01-30 11:22:01 +01:00
Alexandre SPANGARO
1b675ba0b6
FIX: FEC Compatibility for import in ledger
2019-01-30 09:51:29 +01:00
ptibogxiv
a3b648824a
ADD payout link
2019-01-29 14:12:35 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-28 16:35:12 +01:00
Frédéric FRANCE
764a928cd6
wip
2019-01-27 23:48:36 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
46bc078481
Fix phpcs
2019-01-27 23:10:10 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019
...
fix translations
2019-01-27 17:55:05 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Philippe GRAND
b8ec33d29b
fix translations
2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Philippe GRAND
95bbb46fdf
fix translations
2019-01-27 12:20:24 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Philippe GRAND
a6c40dc867
fix translations
2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
51bdf5f949
Fix trans
2019-01-22 16:06:20 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019
...
update with html5 compliant code
2019-01-21 18:05:40 +01:00
Laurent Destailleur
0cba7e1613
FIX Hide path into exported filename
2019-01-21 14:31:27 +01:00
Laurent Destailleur
0b199f4d28
FIX Hide path into exported filename
2019-01-21 14:31:03 +01:00
Laurent Destailleur
495b04a3c7
FIX Hide path into exported filename
2019-01-21 14:30:50 +01:00
Laurent Destailleur
d5e94c1689
Add phpmin of driver
2019-01-21 14:18:31 +01:00
Laurent Destailleur
5c2b9e3078
NEW Introduce PhpSpreadsheet for export (need php5.6+)
2019-01-21 14:06:01 +01:00
Laurent Destailleur
ecf46903ae
Fix doxygen
2019-01-21 13:24:52 +01:00
Philippe GRAND
cdacfc5f37
update with html5 compliant code
2019-01-21 09:54:59 +01:00
Laurent Destailleur
f53232e2f9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 02:56:32 +01:00
Laurent Destailleur
7f8b710edc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 02:52:24 +01:00
Laurent Destailleur
5ab6c41dfa
Fix missing multicurrency fields in export
2019-01-21 02:43:08 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
616aa1f81c
Fix var not defined
2019-01-19 17:10:14 +01:00
laurantines
7556ae4988
Update modFacture.class.php
...
Correct double comma (,,)
2019-01-17 11:58:25 +01:00
laurantines
fa598ad941
Update modFacture.class.php
...
Add localtax1 and localtax2 fields in the export of customer invoices to be able to select them in step 2 of the export
2019-01-17 11:31:32 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
724a2f32c3
Move module as experimental
2019-01-10 01:56:33 +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
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
4b7f373802
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
2018-12-18 21:35:30 +01:00
Laurent Destailleur
6851232314
Fix removing constant no more required
2018-12-18 21:29:36 +01:00
Laurent Destailleur
2e6a41228f
Fix removing constant no more required
2018-12-18 20:49:48 +01:00
Laurent Destailleur
65412b77de
Default nb of digits for customer code "monkey" template is on 5 digits.
2018-12-18 20:16:02 +01:00
Laurent Destailleur
6e0df5d3cc
Default nb of digits for customer code "monkey" template is on 5 digits.
2018-12-18 20:14:36 +01:00
Laurent Destailleur
f1451904c0
Fix phpcs
2018-12-16 17:48:02 +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
e366d7d57c
Work on cash fence
2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Laurent Destailleur
85cd23caaf
Fix phpcs
2018-12-15 18:31:36 +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
db46d82de3
Fix position of menu entries
2018-12-15 15:35:59 +01:00
Laurent Destailleur
2e1b762596
Fix phpcs
2018-12-15 15:07:35 +01:00
Laurent Destailleur
1bce3f6c6b
Fix phpcs
2018-12-15 14:54:10 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
6846d8821d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2018-12-15 14:07:25 +01:00
Laurent Destailleur
dbc85b42ba
Fix phpcs
2018-12-15 13:58:39 +01:00
Laurent Destailleur
c6d76e29f1
Fix phpcs
2018-12-15 13:50:40 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
1971482c24
Merge pull request #10180 from fappels/payments_pdf_expensereport
...
NEW add payments table to pdf of expense report
2018-12-14 17:46:48 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer
...
fix scrunitizer
2018-12-14 17:28:34 +01:00
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members
...
NEW Add gender in member card
2018-12-14 16:24:00 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members
2018-12-14 11:39:02 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Lionel VESSILLER
1512ba9242
Add contact status in category export
2018-12-12 14:20:04 +01:00
Laurent Destailleur
85af3ad513
NEW Unsubscribed emails are now stored in dedicated table
2018-12-11 10:24:57 +01:00
Laurent Destailleur
5ec9a1ca7f
Remove deprecated parameter
2018-12-11 10:15:13 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Maxime Kohlhaas
550df138a6
Fix unexistant fields
2018-12-07 12:19:50 +01:00
fappels
6d27a6458e
Fix travis
2018-12-05 11:10:42 +01:00
fappels
d1d41f4dd4
New add payments table to pdf expense report
2018-12-04 23:16:41 +01:00
Laurent Destailleur
f142238817
Fix missing field canvas
2018-12-04 21:25:59 +01:00
Philippe GRAND
e9e6d8b9b5
Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato>
2018-12-04 16:10:56 +01:00
Philippe GRAND
c113a7ca3b
Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato>
2018-12-04 14:04:02 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
8fea6338e1
Fix #6565
...
Fix pdf footer height for all documents
2018-12-02 18:51:49 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Laurent Destailleur
6f3d2e98a2
Merge pull request #10150 from frederic34/patch-9
...
add log in empty catch
2018-12-01 23:04:41 +01:00
Frédéric FRANCE
471ea35d6c
add log in empty catch
2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08
Update pdf_strato.modules.php
2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68
Update pdf_strato.modules.php
2018-12-01 21:41:40 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
13806124b2
Fix add missing fk_department and fk_pays in contact/bank imports
2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468
fix travis
2018-12-01 17:10:06 +01:00
florian HENRY
589511f38c
fix #9999
2018-12-01 16:23:40 +01:00
florian HENRY
b9046b9174
fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0
2018-12-01 15:42:07 +01:00
Laurent Destailleur
778547818d
Merge pull request #10108 from frederic34/patch-2
...
Avoid adding libs not compatible with php 5.4
2018-12-01 15:09:25 +01:00
Laurent Destailleur
30ed180dd4
Merge pull request #10122 from defrance/patch-129
...
scrutinizer major error correction
2018-12-01 14:29:42 +01:00
BENKE Charlene
676ac67817
scrutinizer error update
2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction
...
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
2018-12-01 11:44:46 +01:00
Frédéric FRANCE
07da468109
Update modDav.class.php
2018-12-01 11:39:58 +01:00
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract
...
Fix pdf strato for contract with multipage
2018-12-01 11:14:38 +01:00
Maxime Kohlhaas
2b5bf0e2dd
Fix pdf strato for contract with multipage
2018-12-01 01:07:15 +01:00
Maxime Kohlhaas
5dcb3d2a1f
Fix extrafields in import tool
2018-11-30 19:23:05 +01:00
Laurent Destailleur
4260d5765f
Fix bad trans key
2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a
Update ChangeLog
2018-11-30 11:00:42 +01:00
Laurent Destailleur
bbfd134733
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390
Merge pull request #10090 from hregis/8.0_bug3
...
FIX remove constant for avoid problem
2018-11-29 11:18:29 +01:00
Laurent Destailleur
9e20d9e847
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8
responsive
2018-11-29 11:03:02 +01:00
Regis Houssin
b4aa9ee335
FIX remove constant for avoid problem
2018-11-28 17:04:42 +01:00
Philippe GRAND
9bf0f12068
fix typo error
2018-11-26 14:32:04 +01:00
Laurent Destailleur
2e139d1960
Fix var $hidedetails not defined
2018-11-25 12:08:49 +01:00
Frédéric FRANCE
491270b27f
try to fix the expensereport pdf
2018-11-21 23:06:52 +01:00
Laurent Destailleur
07fe7e58d8
Code comment
2018-11-20 19:04:58 +01:00
Laurent Destailleur
4b82538941
Better module position
2018-11-20 14:56:14 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124
...
Add societe extrafields on proposal export
2018-11-19 18:33:41 +01:00
Laurent Destailleur
ade0363224
Module status
2018-11-19 15:46:20 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export
2018-11-19 12:17:41 +01:00
Laurent Destailleur
824b1924e2
Fix loading of cronjob
2018-11-19 10:33:42 +01:00
Alexandre SPANGARO
2d55666a0b
NEW Add gender in member card
2018-11-18 21:50:58 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
atm-quentin
56d4a8a737
revert some code
2018-11-16 15:16:48 +01:00
atm-quentin
7571760fdd
fix errors during cherry picking
2018-11-16 11:31:23 +01:00
atm-quentin
70fdff5c27
revert getNextValue function + createfromclone entity
2018-11-16 11:23:14 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
atm-quentin
8e51204dff
manage invoice with multicompany
2018-11-16 11:14:33 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
...
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Regis Houssin
0907a6d611
FIX wrong object name (travis error)
2018-11-14 16:55:14 +01:00
Regis Houssin
874e27ef84
FIX multicompany override constants of current entity
2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4
FIX new method: override constants of current entity
2018-11-14 15:34:39 +01:00
Regis Houssin
9ff4b31843
FIX compatibility with invoice sharing and invoice number sharing
2018-11-14 15:24:22 +01:00
Regis Houssin
04edcaa89c
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-13 20:20:46 +01:00
Laurent Destailleur
628918f863
Remove var_dump
2018-11-12 16:43:33 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
e86e3ec7ac
Work on email collector
2018-11-09 19:30:44 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
9d15f83f4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/stats/index.php
2018-11-08 20:19:28 +01:00
Laurent BOUQUET
320e7adef7
Fix blank lines and whitespace at end of lines
2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f
Merge branch 'develop' into feature/product-search-barcode
2018-11-08 16:57:49 +01:00
Laurent Destailleur
5bbf7e8f1d
Fix look and feel v8
2018-11-08 10:21:43 +01:00
Laurent Destailleur
6ba78b2bb3
Work on email collector
2018-11-07 16:33:06 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
c1cf4fbb95
Fix phpcs
2018-11-06 20:29:58 +01:00
Laurent Destailleur
e0070bd348
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2018-11-06 18:30:57 +01:00
Regis Houssin
d32fd9fda5
FIX export only prices of the current entity !
2018-11-06 18:08:29 +01:00
Laurent Bouquet
f05b67909b
NEW : Add product search from barcode via REST api
2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900
NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and
...
SHIPPING_PDF_HIDE_QTYTOSHIP
2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008
Code comment
2018-11-06 09:39:22 +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
52d4426e87
Debug new modules
2018-11-05 16:38:07 +01:00
Laurent Destailleur
90729c03c4
Fix dependencies of new modules
2018-11-05 10:28:44 +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
7e55701774
2 remind of subscription expired by default
2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2
2 remind of expired subscription by default
2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178
Fix family of module
2018-11-03 11:38:29 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
4b402aa6d1
Fix regression on name of array
2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94
FIX Error generating ODT when option to use contact on doc on
2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f
Debug v9
2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2018-10-31 11:50:29 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
2c3cd7a668
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSyslog.class.php
2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58
Fix phpcs
2018-10-30 15:30:04 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias
...
FIX missing name alias field in societe import/export #9091
2018-10-30 15:00:34 +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
afe61579e8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-30 14:28:25 +01:00
Laurent Destailleur
d309f22e55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf
FIX #9907
2018-10-30 13:54:11 +01:00
Laurent Destailleur
2ced09e8ab
Merge pull request #9888 from aljawaid/patch-3
...
FIX: Expense Report Ref Not Showing in PDF File Properties
2018-10-30 12:20:12 +01:00
Laurent Destailleur
5935a420a8
Merge pull request #9886 from frederic34/catchblockempty
...
fill empty catch with log
2018-10-30 12:16:41 +01:00
Laurent Destailleur
0500f54237
Email collector
2018-10-29 11:29:08 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
abb343d37e
Fix missing name alias field in societe import/export #9091
2018-10-27 09:42:08 +02:00
IJ
71c64c0944
FIX: Expense Report Ref Not Showing in PDF File Properties
...
The generated pdf title field in the pdf file document properties was blank. This fixes that.
2018-10-27 01:57:07 +01:00
Frédéric FRANCE
b80d2fa12d
fill empty catch with log
2018-10-26 21:09:46 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
Marc de Lima Lucio
16c35035c1
FIX: pdf typhon: order reference duplicate
2018-10-25 12:07:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9
2018-10-24 12:24:00 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
aa0bcc6878
Fix phpcs
2018-10-24 11:15:14 +02:00
Frédéric FRANCE
2bc208675f
Update pdf_cyan.modules.php
2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2
Update pdf_sponge.modules.php
2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39
Update pdf_eratosthene.modules.php
2018-10-24 08:18:21 +02:00
Laurent Destailleur
0f48cc1d0f
Merge branch 'develop' into fixpdf
2018-10-24 03:01:52 +02:00
Laurent Destailleur
f10cb76597
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5
Disable duplicate feature with emailing module and field "unsubscribe
...
requested"
2018-10-24 02:00:43 +02:00
John BOTELLA
d9965d1986
Fix travis messages
2018-10-23 17:18:30 +02:00
atm-quentin
52236d1f0c
set to development module
2018-10-23 15:58:38 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +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
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf
2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541
NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF
2018-10-22 20:06:03 +02:00
atm-quentin
7684d7bddd
FIX export comment better than desc of order line
2018-10-22 15:51:47 +02:00
Frédéric FRANCE
042118fe38
fix it
2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf
2018-10-19 18:20:06 +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
Frédéric FRANCE
6c85fbbc30
add log and comment
2018-10-18 21:47:10 +02:00
atm-quentin
ba997a0d0f
FIX for mask
2018-10-18 14:48:20 +02:00
atm-quentin
8ef7c29d19
FIX PDF Total Ordered
2018-10-17 17:17:11 +02:00
atm-quentin
dd0a57d39e
FIX pdf for creating invoice without massaction
2018-10-17 15:36:47 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76
...
NEW move ticket dictionary in API /setup
2018-10-16 21:39:30 +02:00
atm-quentin
354825d006
NEW modele pdf canelle_reception to display linked reception to line
2018-10-16 14:58:56 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Laurent Destailleur
6d4d8a0342
Dolibarize data privacy policy module
2018-10-15 14:05:54 +02:00
Maxime Kohlhaas
c66823d72f
Fix numbering of supplier credit notes (issue #9624 )
2018-10-14 17:07:38 +02:00
Philippe GRAND
effd11e1f9
translation
2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-13 12:40:28 +02:00
Laurent Destailleur
e5cc4ae61b
Code comment
2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368
fix typo
2018-10-13 11:58:19 +02:00
atm-quentin
83e4d6bd13
NEW export reception
2018-10-11 15:28:28 +02:00
atm-quentin
7ad4a7e384
NEW creation facture fourn depuis reception
2018-10-09 16:26:40 +02:00
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies
...
Dolibarization DataPolicies
2018-10-09 16:03:14 +02:00
Inovea Conseil
768ab66d1f
Datapolicies
2018-10-09 14:40:15 +02:00
atm-quentin
9f56540e75
NEW actions buttons done with stock movement
2018-10-09 11:33:41 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
atm-quentin
c6ab79bad3
NEW note, contact and lines on card
2018-10-08 16:54:33 +02:00
Laurent Destailleur
a0ba01321b
Fix phpcs
2018-10-06 12:50:32 +02:00
Philippe GRAND
61daff6cb6
Standardize code
2018-10-06 12:34:51 +02:00
Laurent Destailleur
e24117e75b
Fix position of modules is string on 2 digits
2018-10-06 11:57:53 +02:00
Laurent Destailleur
d1dde0ffac
Include rgpd module with name DataPolicies
2018-10-06 02:51:47 +02:00
Laurent Destailleur
fd859d3162
Add a component to select lang into a web site
2018-10-03 18:40:54 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +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
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018
2018-10-01 02:20:16 +02:00
Frédéric FRANCE
c8ddf18558
Update mod_codeclient_monkey.php
2018-09-30 23:02:52 +02:00
Laurent Destailleur
aaa5efc77e
Clean Take pos module
2018-09-28 22:06:04 +02:00
Laurent Destailleur
492b9c1a03
Fix phpcs
2018-09-28 18:03:53 +02:00
Laurent Destailleur
47da95fbbf
Fix dependency of module
2018-09-28 13:50:37 +02:00
Laurent Destailleur
f990719daa
Add experimental module TakePOS
2018-09-28 13:31:41 +02:00
Laurent Destailleur
a88dcfd1e4
Fix phpcs
2018-09-28 02:24:11 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018
...
Standardize and update code from New branch 21 09 2018
2018-09-27 10:07:15 +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
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018
2018-09-27 09:42:58 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018
2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d
Translated comment
2018-09-23 21:35:43 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018
...
Standardize and update code from New branch 20 09 2018
2018-09-23 15:35:42 +02:00
Philippe GRAND
3464afe391
Update comment
2018-09-21 15:12:17 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php
2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php
2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php
2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45
Update comments
2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844
fix merging
2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc
fix merging
2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018
2018-09-21 13:55:04 +02:00
Laurent Destailleur
7ece28ffd3
Trans
2018-09-21 11:48:01 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder
2018-09-21 11:12:19 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018
2018-09-21 10:12:48 +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
f7392871dd
Merge pull request #9579 from frederic34/patch-9
...
remove warning Line exceeds 500 characters
2018-09-21 09:40:28 +02:00
Philippe GRAND
bde8d8ae0e
Comment and typo
2018-09-21 09:32:50 +02:00
Philippe GRAND
f59ac8dda5
Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018
2018-09-21 09:07:17 +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
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters
2018-09-20 20:44:17 +02:00
Laurent Destailleur
4ba057528f
Fix permissionss
2018-09-20 19:37:28 +02:00
Laurent Destailleur
36b8958c59
Move Stripe menu transactions and charges from develop to experimental
2018-09-20 19:35:13 +02:00
Philippe GRAND
e1a03c49cf
Standardize and update code
2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498
Standardize and update code
2018-09-20 17:11:29 +02:00
Philippe GRAND
e64fbd9522
Standardize and update code
2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9
Standardize and update code
2018-09-20 16:58:34 +02:00
Philippe GRAND
2adfdab771
Standardize and update code
2018-09-20 15:14:59 +02:00
Philippe GRAND
92a484dcd9
Standardize and update code
2018-09-20 15:07:43 +02:00
Philippe GRAND
7eda9c846c
Standardize and update code
2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802
Standardize and update code
2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3
Standardize and update code
2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79
Standardize and update code
2018-09-20 14:43:54 +02:00
Philippe GRAND
7c92157636
Standardize and update code
2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36
Standardize and update code
2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14
Standardize and update code
2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2
Standardize and update code
2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba
Standardize and update code
2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667
Standardize and update code
2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88
Standardize and update code
2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78
Standardize and update code
2018-09-20 13:56:18 +02:00
Philippe GRAND
c0dc4f3a48
Standardize and update code
2018-09-20 13:52:57 +02:00
Philippe GRAND
7b50935e49
Standardize and update code
2018-09-20 13:44:45 +02:00
Philippe GRAND
a14c520910
Standardize and update code
2018-09-20 13:41:26 +02:00
Philippe GRAND
88bf2dee64
Standardize and update code
2018-09-20 13:36:00 +02:00
Philippe GRAND
7ffcc2e63f
Standardize and update code
2018-09-20 13:32:41 +02:00
Philippe GRAND
cbda62b1ca
Standardize and update code
2018-09-20 12:30:38 +02:00
Philippe GRAND
803505b6b7
Standardize and update code
2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f
Standardize and update code
2018-09-20 12:21:49 +02:00
Philippe GRAND
50073fe98d
Standardize and update code
2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d
Standardize and update code
2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3
Standardize and update code
2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9
Standardize and update code
2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733
Standardize and update code
2018-09-20 12:07:23 +02:00
Philippe GRAND
32beccc3be
Standardize and update code
2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af
Standardize and update code
2018-09-20 12:00:10 +02:00
Philippe GRAND
d5a3411fbc
Standardize and update code
2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce
Standardize and update code
2018-09-20 11:18:02 +02:00
Philippe GRAND
0222ea7e8c
Standardize and update code
2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e
Standardize and update code
2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54
Standardize and update code
2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56
Standardize and update code
2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196
Standardize and update code
2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8
Standardize and update code
2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5
Standardize and update code
2018-09-20 09:03:26 +02:00
Philippe GRAND
52533a0210
Standardize and update code
2018-09-19 16:43:37 +02:00
Philippe GRAND
bd3ba04e24
Standardize and update code
2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f
Standardize and update code
2018-09-19 16:31:36 +02:00
Philippe GRAND
30e426e487
Standardize and update code
2018-09-19 16:21:52 +02:00
Laurent Destailleur
824b572bd0
FIX Amount when using mutlicurrency on PDF
...
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.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
2018-09-19 15:03:24 +02:00
Laurent Destailleur
2b67da3f34
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-09-19 14:52:43 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018
...
Standardize and update code
2018-09-19 14:26:28 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf
2018-09-19 09:26:56 +02:00
Laurent Destailleur
2ec02afa8b
Fix nb of module
2018-09-19 01:14:55 +02:00
Philippe GRAND
4536993fdc
Standardize and update code
2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b
Standardize and update code
2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a
Standardize and update code
2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af
Standardize and update code
2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3
Standardize and update code
2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2
Standardize and update code
2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b
Standardize and update code
2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231
Standardize and update code
2018-09-18 16:49:20 +02:00
Philippe GRAND
b4692f0812
fix merge
2018-09-18 16:45:06 +02:00
Laurent Destailleur
99d214abd5
Fix family of module Payment of employee salaries
2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d
fix merge
2018-09-18 16:38:14 +02:00
Philippe GRAND
ad061f4e13
Standardize and update code
2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a
Standardize and update code
2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f
Standardize and update code
2018-09-18 11:02:18 +02:00
Philippe GRAND
d1a27b33fb
Standardize and update code
2018-09-17 17:28:05 +02:00
Philippe GRAND
b06516180b
Standardize and update code
2018-09-17 15:06:41 +02:00
Laurent Destailleur
797de131a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb
Fix sql
2018-09-17 02:23:11 +02:00
Laurent Destailleur
cc4fbfc3ef
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +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
55e7989552
FIX #9043
2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b
Code comment
2018-09-16 09:31:06 +02:00
Laurent Destailleur
34b75828d3
Work on fix for #9043
2018-09-16 09:27:36 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018
...
New branch 15 09 2018
2018-09-15 23:59:10 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018
...
Standardize and update code
2018-09-15 17:30:14 +02:00
Philippe GRAND
0654b7b0ef
Standardize and update code
2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04
Standardize and update code
2018-09-15 10:47:50 +02:00
Philippe GRAND
fa1521d948
Standardize and update code
2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f
Standardize and update code
2018-09-14 14:05:19 +02:00
Philippe GRAND
33d9e24bd6
Standardize and update code
2018-09-14 11:58:49 +02:00
John BOTELLA
d1321e5a7b
change new PDF version
2018-09-14 09:54:39 +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
John BOTELLA
477acb2e4c
change new PDF version
2018-09-14 09:48:15 +02:00
Laurent Destailleur
16ed582124
Add comment
2018-09-14 01:45:03 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function
2018-09-13 11:13:32 +02:00
Philippe GRAND
ffad80eef6
Standardize and update code
2018-09-13 09:45:07 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2
...
start changing phpcs:ignore
2018-09-12 21:14:34 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Philippe GRAND
06cde1c35f
Standardize and update code
2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9
Standardize and update code
2018-09-12 19:24:45 +02:00
ias-ceo
fece67b629
use correct resultset
2018-09-12 19:00:19 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop
...
Fix : use correct resultset
2018-09-12 18:59:45 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018
...
New branch 11 09 2018
2018-09-12 18:15:03 +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
Philippe GRAND
b8df44167a
Standardize and update code
2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f
Fix warning
2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851
Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018
2018-09-12 14:48:50 +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
Laurent Destailleur
af2e19eba8
Replace skype module with social networks module to support more fields
2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901
Standardize and update code
2018-09-12 10:10:07 +02:00
ias-ceo
b4691df8d9
use correct resultset
2018-09-10 17:29:29 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Laurent Destailleur
0ef17fe581
FIX Problems with permissions of module to record payment of salaries
2018-09-07 13:32:56 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-06 21:28:30 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore
2018-09-06 21:27:18 +02:00
Frédéric FRANCE
cbf4a20a13
move phpcs:ignore
2018-09-06 19:03:09 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore
2018-09-06 18:29:01 +02:00
Laurent Destailleur
f7c87a9ad3
Clean cron init
2018-09-05 22:46:08 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Frédéric FRANCE
85df267a5b
move phpcs:ignore
2018-09-05 20:36:44 +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
Frédéric FRANCE
f7c3ca9d20
move phpcs:ignore
2018-09-05 18:49:06 +02:00
Laurent Destailleur
3650dc3ec9
FIX #8452
2018-09-05 15:25:47 +02:00
Frédéric FRANCE
ecc6c118a6
move phpcs:ignore
2018-09-04 23:26:37 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore
2018-09-04 22:52:55 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore
2018-09-04 21:53:53 +02:00
Frédéric FRANCE
c6cef85ccd
move phpcs:ignore
2018-09-04 21:16:17 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore
2018-09-04 20:00:09 +02:00
Frédéric FRANCE
1ae1afe843
move phpcs:ignore
2018-09-04 08:09:48 +02:00
Frédéric FRANCE
d08b68e8ed
move phpcs:ignore
2018-09-03 20:38:52 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore
2018-09-03 19:00:37 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore
2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore
2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c
move phpcs:ignore
2018-09-02 23:25:10 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Laurent Destailleur
0bf850c1ea
Fix phpcs
2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975
Fix syntax error
2018-09-02 16:18:08 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15
...
Update html_cerfafr.modules.php
2018-09-02 15:38:19 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13
...
Update doc_generic_user_odt.modules.php
2018-09-02 15:35:54 +02:00
Philippe GRAND
5cd9557318
Standardize and Update code
2018-09-01 23:12:20 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php
2018-09-01 16:23:30 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php
2018-09-01 15:29:41 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +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
Philippe GRAND
bd473059ae
precise label comment
2018-09-01 14:13:05 +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
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21
...
Update modSociete.class.php
2018-09-01 13:31:23 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
0e5d4206c9
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 12:47:34 +02:00
Josep Lluís
bfaf7ae473
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:43:02 +02:00
Laurent Destailleur
8bd231adb0
Merge pull request #9357 from joseplluis/patch-3
...
FIX undefined rights_class on modules may lose setup when module disabled
2018-09-01 12:42:22 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Frédéric FRANCE
3b2e7732c2
function Comment Missing
2018-08-31 22:49:11 +02:00
Frédéric FRANCE
c2e49c82f8
function Comment Missing
2018-08-31 22:34:02 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php
2018-08-30 23:22:06 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-08-30 18:12:02 +02:00
Philippe GRAND
2e66c65650
WTF...
2018-08-30 12:03:20 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018
2018-08-29 12:47:01 +02:00
Philippe GRAND
d948c9e2db
Fix white spaces
2018-08-29 12:42:55 +02:00
Laurent Destailleur
0eb4f8bb96
NEW Can set the datestart and dateend of cron job into module descriptor
2018-08-29 11:47:20 +02:00
Philippe Grand
fa992c3e6d
Update modules_import.php
2018-08-28 10:44:18 +02:00
Philippe GRAND
65af8f902f
Update and standardize code
2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-25 09:07:04 +02:00
Laurent Destailleur
7a35b560a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-23 19:51:52 +02:00
Philippe GRAND
74ce0bfea6
Standardize and update code
2018-08-23 16:54:24 +02:00
Philippe GRAND
aafa16afa5
Update and standardize code
2018-08-23 11:11:46 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
d91b1fd895
Update and standardize code
2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces
2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
21a9fd625f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 14:15:22 +02:00
Laurent Destailleur
5f6c165fb6
Module builder is stable
2018-08-21 14:14:27 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
9dbb0eaab0
Fix cron task label
2018-08-21 14:01:03 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
...
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
d8365e9260
Module DAV
2018-08-19 02:17:12 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Philippe GRAND
edb566501d
Update and standardize code
2018-08-17 18:54:41 +02:00
Philippe GRAND
78e9e05f95
Update and standardize code
2018-08-17 18:35:51 +02:00
Frédéric FRANCE
d68f176e7e
replace obsolete phpcs tags
2018-08-16 14:59:06 +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
4c52384609
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-08-16 14:47:56 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-14 15:54:40 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
florian HENRY
20309665e6
fix : ODT project substitution
2018-08-14 10:45:08 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-14 09:02:12 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
0b5a87a443
Update modules_holiday.php
2018-08-13 17:25:41 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +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
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
John BOTELLA
6fad0ea5bd
Add retained warranty to pdf
2018-08-10 16:03:39 +02:00
gauthier
391230babc
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
2018-08-10 15:39:49 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-08-08 17:31:23 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
Ferran Marcet
5ce31f65a4
Fix: Bad position when document have incoterms/notes
2018-08-07 11:40:11 +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
florian HENRY
ceb85cfa45
fix : odt project and task extrafields management
2018-07-31 17:29:08 +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
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +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
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Laurent Destailleur
3e54ee5df7
Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop
...
Fix chromephp firephp Syslog infinite loop
2018-07-24 16:53:32 +02:00
Frédéric FRANCE
4341e367d2
remove % in supplier order pdf
2018-07-23 10:30:28 +02:00
fappels
b697307bac
Fix chromephp firephp Syslog infinite loop.
...
When chromephp/firephp not found ->trans causes infinite loop. Can
happen when files moved to other server or location.
2018-07-22 10:41:39 +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
1d8c42265c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd
Fix missing customer code and ref customer
2018-07-21 12:56:18 +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
c94437c3cf
Fix file in wrong dir
2018-07-16 10:14:51 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018
...
update code
2018-07-16 10:09:46 +02:00
Laurent Destailleur
6bf4ef5ef4
Fix double "
...
Fix double "
2018-07-16 10:09:13 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018
...
update description code
2018-07-16 10:03:54 +02:00
Laurent Destailleur
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018
...
docs: complete comments
2018-07-15 20:12:21 +02:00
Laurent Destailleur
29c76a3f56
Merge pull request #9090 from grandoc/new_branch_10_07_2018
...
New branch 10 07 2018
2018-07-15 19:52:07 +02:00
Philippe GRAND
6945680e03
update code and typo
2018-07-12 10:11:42 +02:00
Philippe GRAND
72adc485f0
Docs : Update and complete
2018-07-10 22:32:55 +02:00
Philippe GRAND
0d10722a7f
Docs : Update and complete
2018-07-10 14:57:23 +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
3231f0031c
Merge pull request #9085 from grandoc/new_branch_10_07_2018
...
Docs : Update and complete
2018-07-10 10:43:32 +02:00
Philippe GRAND
243bc49a90
Docs : Typo
2018-07-10 09:38:05 +02:00
Philippe GRAND
b92190ac69
Docs : Update and complete
2018-07-10 09:32:55 +02:00
Philippe GRAND
df1bead49b
Docs : update and complete comments
2018-07-09 19:04:50 +02:00
Philippe GRAND
b4b3e33e3e
Docs : update and complete comments
2018-07-09 17:22:34 +02:00
Laurent Destailleur
3cda462faf
Merge pull request #9065 from aspangaro/9.0_a1
...
Add customer accountancy code on deposit slips export
2018-07-09 17:08:13 +02:00
Laurent Destailleur
f5d9403c7d
Fix permission to see HR tab on user. All HR on same tabs.
2018-07-09 15:38:00 +02:00
Laurent Destailleur
ba6566867e
Merge pull request #9064 from grandoc/new_branch_06_07_2018
...
fix : typo and update code
2018-07-09 15:33:25 +02:00
Philippe GRAND
2c4d7c4835
Docs : update and complete
2018-07-09 14:06:59 +02:00
Philippe GRAND
12d4880e7b
Docs : update and complete
2018-07-09 10:08:27 +02:00
Philippe GRAND
47e80123d5
Docs : update code
2018-07-07 11:36:46 +02:00
Philippe GRAND
fe5bfe3aaf
Docs : update comments
2018-07-07 10:51:09 +02:00
Philippe GRAND
1e1ed485f5
Docs : update comments
2018-07-07 10:47:56 +02:00
Alexandre SPANGARO
655d55eae6
Add customer accountancy code on deposit slips export
2018-07-07 02:46:56 +02:00
Laurent Destailleur
a62fd8ef84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:45 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
05ed721a8c
Fix name of constant for module TICKET
2018-07-06 13:09:07 +02:00
Philippe GRAND
988130d2a1
docs: complete comments
2018-07-05 17:04:11 +02:00
Philippe GRAND
4cbe3a5bc7
docs: complete comments
2018-07-05 17:01:47 +02:00
Maxime Kohlhaas
39f890d84a
Fix TICKETSUP var name
2018-07-05 14:51:00 +02:00
Maxime Kohlhaas
74b9f87cab
Fix ticket : missing file for numbering
2018-07-05 14:35:12 +02:00
Philippe GRAND
1cc73ae8ca
docs: complete comments
2018-07-05 10:16:20 +02:00
Philippe GRAND
afd3868a8a
docs: complete comments
2018-07-04 14:38:56 +02:00
Laurent Destailleur
38cd5180d9
FIX for migration from old versions
2018-07-03 20:11:59 +02:00
Laurent Destailleur
275f981545
FIX for migration from old versions
2018-07-03 20:08:55 +02:00
Laurent Destailleur
f7b8e09268
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0
Fix travis
2018-07-03 13:49:41 +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
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany
...
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Philippe GRAND
0aa58537bb
update code comment
2018-07-02 15:07:00 +02:00
Philippe GRAND
74c45fa876
update code comment
2018-07-02 14:30:30 +02:00
Philippe GRAND
f43cce34c8
update code comment
2018-07-02 13:34:21 +02:00
Philippe GRAND
8497f56a04
update description code
2018-07-02 12:35:06 +02:00
Laurent Destailleur
9c5d34fc5f
Fix translation
2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110
Fix page code in pdf
2018-07-02 12:25:09 +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
11021353da
Fix text in payment area of crabe pdf
2018-07-02 11:33:33 +02:00
Laurent Destailleur
93184c5f66
Fix travis
2018-07-01 23:57:54 +02:00
Regis Houssin
05c666c18b
Fix: use numbering model corresponding to the entity of the object
2018-07-01 17:06:19 +02:00
Regis Houssin
80adac12c0
Fix: use object entity ID instead current entity
2018-07-01 16:01:30 +02:00
Laurent Destailleur
e06eb9e2fc
Fix phpcs
2018-06-30 18:38:23 +02:00
Laurent Destailleur
751ddb46d2
Update pdf_blochet.class.php
2018-06-30 18:31:32 +02:00
Philippe GRAND
640f7697e4
update code
2018-06-30 11:45:49 +02:00
Laurent Destailleur
df96c5ca81
Merge pull request #8796 from defrance/patch-113
...
introduce serial and document for holiday module
2018-06-30 02:09:28 +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
John
008163628a
New pdf documents using new column system
2018-06-26 08:03:25 +02:00
Laurent Destailleur
2649c136cf
Fix SYSLOG_FILE_ONEPERSESSION
2018-06-24 14:31:03 +02:00
Laurent Destailleur
848c8cdc4b
Fix mode SYSLOG_FILE_ONEPERSESSION to work as expected
2018-06-24 13:59:37 +02:00
Laurent Destailleur
1b5c5cfafb
Fix select status
2018-06-24 10:42:07 +02:00
Laurent Destailleur
c405181393
Merge pull request #8987 from a-schild/develop
...
Added mailing by thirdparty filtering by prospect type and status
2018-06-24 10:31:09 +02:00
Marc de Lima Lucio
dc951029cd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm
2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c
FIX PR #8841
2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5
FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts
2018-06-20 10:22:43 +02:00
Laurent Destailleur
fb2e820329
Fix menu not visible on jmobile
2018-06-19 13:17:46 +02:00
Laurent Destailleur
b364412a4a
FIX Menu scheduled jobs not visible on jmobile conf
2018-06-19 13:10:13 +02:00
a-schild
baba0757d7
Added filtering by prospect type and status
...
Added filtering by prospect type and status
2018-06-19 11:46:03 +02:00
a-schild
211bb87e46
Moved functionality to select by categories
...
Moved functionality to select by categories
2018-06-19 11:45:27 +02:00
Philippe GRAND
62586c7c5d
clean and upsdate code
2018-06-18 12:47:17 +02:00
a-schild
3e9bc75c9c
Added mailings to thirdparties
...
Allows to select third parties as mailing targets, depending client/lead
and active/inactive status
2018-06-18 12:23:27 +02:00
Laurent Destailleur
5675c8fc01
Update modFournisseur.class.php
2018-06-18 11:26:03 +02:00
Laurent Destailleur
e993a41160
Update modFournisseur.class.php
2018-06-18 11:24:58 +02:00
Laurent Destailleur
5632228153
Update modFournisseur.class.php
2018-06-18 11:23:36 +02:00
Marc de Lima Lucio
a5898b830b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0
2018-06-14 10:48:09 +02:00
Marc de Lima Lucio
a80e1c601c
NEW: supplier order/order lines export: add supplier product ref
2018-06-14 10:43:01 +02:00
Laurent Destailleur
8d1456fb7f
Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal
...
add product units management in supplier proposal documents
2018-06-13 21:41:39 +02:00
Laurent Destailleur
b8e927d347
Merge pull request #8915 from grandoc/new_branch_04_06_2018
...
clean and update code
2018-06-13 20:16:19 +02:00
Laurent Destailleur
6fbdcea356
Code comment
2018-06-13 19:22:50 +02:00
atm-greg
d14f40f722
add product units management in supplier proposal documents
2018-06-12 14:36:32 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Philippe GRAND
909fa496e5
clean and update code
2018-06-04 17:37:17 +02:00
Laurent Destailleur
69dd11f7c6
Fix: Must use a standard (internationnal) date format.
2018-06-04 14:05:47 +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
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
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
2ae9591d0d
Fix english name
2018-05-29 11:10:21 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Laurent Destailleur
fa252d5cbd
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm
2018-05-25 11:59:22 +02:00
Laurent Destailleur
9d407cdc03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3
Fix duplicate deprecated file
2018-05-25 11:26:50 +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
b9fbf13eba
Fix look and feel v8
2018-05-25 09:36:49 +02:00
Laurent Destailleur
9f2f8ca7e0
Fix scrutinizer
2018-05-25 09:31:16 +02:00
Laurent Destailleur
23e2bb20d9
Look and feel v8
2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +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
3a06918b16
FIX Missing extrafields in export of stock or products
2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666
FIX Missing extrafields in export
2018-05-23 17:48:18 +02:00
Marc de Lima Lucio
111f3a9649
FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts
2018-05-23 11:11:33 +02:00
Laurent Destailleur
a1c799507a
Fix $contactobject not always defined
2018-05-23 08:16:24 +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
e2665bd30e
NEW : Accountancy Add import on general ledger
2018-05-19 07:29:17 +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
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
Alexandre SPANGARO
cb815e5e3b
Update works
2018-05-13 07:50:24 +02:00
Laurent Destailleur
9315d9c423
NEW Introduce permission "approve" for "leave request" like for "expense
...
report"
2018-05-10 18:56:21 +02:00
Laurent Destailleur
a65170ba2d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-10 14:16:19 +02:00
Laurent Destailleur
0c35bc5284
Standardize code
2018-05-10 14:15:52 +02:00
Laurent Destailleur
3c6d1ccbac
Merge branch 'develop' into develop
2018-05-10 13:13:53 +02:00
Laurent Destailleur
2fb5de6136
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e
Reorder permissions
2018-05-10 12:29:58 +02:00
Laurent Destailleur
afa9db2a88
Merge pull request #8752 from delcroip/patch-14
...
FIX Add properly the project models
2018-05-10 11:54:00 +02:00
Laurent Destailleur
9e807c1c01
Merge pull request #8751 from wdammak/patch-7
...
Add models pdf to warehouse module
2018-05-10 11:41:03 +02:00
BENKE Charlene
79bb8ef6c7
Update modHoliday.class.php
2018-05-07 22:47:24 +02:00
BENKE Charlene
3d268933a4
Create mod_holiday_madonna.php
2018-05-07 22:35:19 +02:00
BENKE Charlene
a20632d31d
Create mod_holiday_immaculate.php
2018-05-07 22:34:26 +02:00
BENKE Charlene
ffaff97af1
Create modules_holiday.php
2018-05-07 22:33:14 +02:00
BENKE Charlene
8546943898
Create index.html
2018-05-07 22:30:40 +02:00
atm-quentin
8cd6c72a2f
NEW advanced rights
2018-05-07 10:04:43 +02:00
wdammak
d038bf3e4b
Merge pull request #8 from Dolibarr/develop
...
Update rep
2018-05-06 17:01:44 +01:00
delcroix Patrick
a2c93e56ae
fixAdd properly the project models
...
Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.
2018-05-06 13:36:37 +02:00
wdammak
fb81088a4b
Add models warehouse and movement
2018-05-05 13:44:11 +01:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
wdammak
c269699679
Add model_pdf to warehouse module
2018-05-05 13:33:34 +01:00
Laurent Destailleur
f6ca1eb624
Fix permission name
2018-05-05 13:24:46 +02:00
atm-quentin
ec5e84075e
NEW Rights to ignore price min
2018-05-03 10:18:38 +02:00
wdammak
2cf1aa967c
Add warehouse models pdf
2018-05-03 01:01:05 +01:00
Laurent Destailleur
cb76d2ce0f
Better logging
2018-05-01 18:58:19 +02:00
Laurent Destailleur
8be8249f85
Clean code, fix warnings
2018-05-01 12:40:42 +02:00
Laurent Destailleur
f50a6149d5
Look and feel v8 (menu statistics at end)
2018-05-01 11:09:03 +02:00
Laurent Destailleur
55f982e504
Removed deprecated FPDI option and reorganise PDF setup page
2018-04-30 09:28:24 +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
Regis Houssin
2906358383
Fix: use "socpeople" instead "societe"
2018-04-27 10:42:10 +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
32511422ab
Fix PSR2
2018-04-22 20:08:29 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
46e448a086
Fix default agenda view
2018-04-22 17:57:20 +02:00
Laurent Destailleur
f83369d268
Remove travis warnings
2018-04-22 11:27:26 +02:00
Laurent Destailleur
9eeaf5c3eb
dol_syslog now strftime instead of dol_print_date
2018-04-21 12:22:21 +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
7baf0eddbc
NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated
...
accounting account.
2018-04-20 01:10:57 +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
Laurent Destailleur
013f95f54b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-18 00:02:51 +02:00
Laurent Destailleur
5713a048fe
Merge pull request #8632 from aspangaro/8.0-a21
...
Fix Accountancy
2018-04-17 21:30:16 +02:00
Alexandre SPANGARO
e0c0f7fd9b
Fix Accountancy
2018-04-17 20:04:55 +02:00
Laurent Destailleur
fee4966219
Merge pull request #8601 from frederic34/esign
...
NEW add optional esign field in pdf propal
2018-04-17 16:12:53 +02:00
atm-greg
90f1ab8af4
add hooks on supplier documents
2018-04-16 06:46:22 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Frédéric FRANCE
46cfe1e2e7
Merge remote-tracking branch 'upstream/develop' into esign
2018-04-15 14:33:03 +02:00
Frédéric FRANCE
d4c03230a0
add optional esign field in pdf propal
2018-04-15 11:34:21 +02:00
Regis Houssin
d97c052d08
Fix: broken $pdf object !
2018-04-14 10:41:38 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +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
e437989853
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-12 13:25:27 +02:00
atm-greg
ae34fa6fbd
add supplier contact name on supplier documents
2018-04-11 17:42:26 +02:00
Laurent Destailleur
419b225120
Clean code
2018-04-07 21:11:58 +02:00
Laurent Destailleur
d7d9c8c338
Fix module descriptor of dav module
2018-04-07 21:04:08 +02:00
Laurent Destailleur
98b9f6bb47
DAV module
2018-04-07 19:12:41 +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
48ff89c63b
Fix regression
2018-04-05 19:52:54 +02:00
Laurent Destailleur
0223d54107
FIX Support or multicompany for sheduled jobs
...
FIX Use priority to define order of sheduled jobs
Conflicts:
htdocs/cron/list.php
2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822
FIX Support or multicompany for sheduled jobs
...
FIX Use priority to define order of sheduled jobs
2018-04-05 12:36:14 +02:00
Alexandre SPANGARO
a5428cc8c7
NEW Module Assets
2018-04-01 21:26:52 +02:00
Philippe GRAND
5b1efc2227
New [*use loadLangs for translation files*] and update code
2018-03-27 19:30:31 +02:00
Laurent Destailleur
6eca679f68
Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key
...
FIX #7581 Import INSERT foreign key
2018-03-27 17:47:45 +02:00
Laurent Destailleur
d41908e52a
Update import_xlsx.modules.php
2018-03-27 17:46:50 +02:00
Laurent Destailleur
86c4bb23ad
Update import_csv.modules.php
2018-03-27 17:46:28 +02:00
Laurent Destailleur
3eee68c404
NEW Prototype of a module DAV
2018-03-27 16:18:12 +02:00
François J
e892089afd
Fix Import INSERT foreign key
...
Check the row referencing this foreign key exists first
instead of always trying to perform an UPDATE.
2018-03-26 17:52:43 +02:00
Laurent Destailleur
9f11cf77df
Merge ticket css in main css
2018-03-26 15:45:56 +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
934d2d8881
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:27:31 +02:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
florian HENRY
1feb22ea9c
fix user right on modRessource
2018-03-21 22:24:11 +01:00
Laurent Destailleur
423bd56646
Merge pull request #8423 from grandoc/new_branch_20_03_2018
...
New [*use loadLangs for translation files*]
2018-03-21 20:39:40 +01:00
Laurent Destailleur
517301f014
Work on subscription reminder
2018-03-21 16:40:09 +01:00
Laurent Destailleur
200fd88132
Fix output message in log rotation job
2018-03-21 13:56:24 +01:00
Philippe GRAND
0d7ffefc8f
New [*use loadLangs for translation files*]
2018-03-20 19:47:25 +01:00
Laurent Destailleur
09beb9186e
Merge pull request #8403 from atm-maxime/develop
...
New filter on product supplier price import update
2018-03-18 14:18:20 +01:00
Philippe GRAND
68b1e5f8fd
New [*use loadLangs for translation files*]
2018-03-16 17:40:19 +01:00
Maxime Kohlhaas
3ccdb4d829
New filter on product supplier price import update
2018-03-16 14:22:46 +01:00
Laurent Destailleur
5a397fff72
Fix scrutinizer bugs
2018-03-16 00:16:32 +01:00
Laurent Destailleur
7f8f0c5dc1
Fix parameter silent was inverted
2018-03-15 21:48:51 +01:00
Philippe GRAND
e8df916770
New [*use loadLangs for translation files*]
2018-03-15 17:14:11 +01:00
Laurent Destailleur
ea3fbf63cd
Merge pull request #8390 from grandoc/new_branch_14_03_2018
...
New [*use loadLangs for translation files*]
2018-03-15 15:07:55 +01:00
Laurent Destailleur
9256faf6fb
Update pdf_merou.modules.php
2018-03-15 15:07:08 +01:00
Philippe Grand
c8e672d01a
use $outputlangs instead of $langs
2018-03-15 09:18:40 +01:00
Philippe Grand
3f0764f282
use $outputlangs instead of $langs
2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1
use $outputlangs instead of $langs
2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7
use $outputlangs instead of $langs
2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3
Change $langs by $outputlangs
2018-03-15 09:06:01 +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
Philippe GRAND
743a61159d
use loadLangs for translation files
2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313
use loadLangs for translation files
2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906
use loadLangs for translation files
2018-03-14 19:10:22 +01:00
Laurent Destailleur
4bd05f854c
Merge pull request #8371 from frederic34/pdfaddress
...
add object in pdf_build_address source
2018-03-13 14:04:49 +01:00
Laurent Destailleur
9f07ff0f9b
Fix travis
2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5
Debug ticket module
2018-03-13 13:56:45 +01:00
Frédéric FRANCE
c76dce64d3
add object in pdf_build_address source
2018-03-13 12:15:03 +01:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
Laurent Destailleur
cd71e49762
Picto ticket module
2018-03-13 10:42:58 +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
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
Laurent Destailleur
70490e2b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/ticketsup/class/actions_ticketsup.class.php
2018-03-11 18:29:19 +01:00
Laurent Destailleur
8b6dea218b
Dolibarrize module
2018-03-11 18:28:27 +01:00
Laurent Destailleur
d9b55f2275
Merge branch 'develop' into dev_ticketsup
2018-03-11 18:12:47 +01:00
Laurent Destailleur
40cf236f92
Merge branch 'develop' into ticketsup_core
2018-03-11 18:10:11 +01:00
Laurent Destailleur
d6eee30ee9
Merge pull request #8336 from defrance/patch-106
...
add sql log on install debug
2018-03-11 18:06:18 +01:00
Laurent Destailleur
dea80eba4e
Use a constant name starting with MAIN
2018-03-11 18:06:08 +01:00
jfefe
c3fab4c54c
Fix Phpunit issue
2018-03-11 16:48:26 +01:00
florian HENRY
cfdaa7c88d
ticket sup make it work
2018-03-11 16:07:13 +01:00
Laurent Destailleur
e14d2f08b8
Dolibarize
2018-03-11 11:12:38 +01:00
BENKE Charlene
bfaffe6692
Changes Done
2018-03-11 10:51:05 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
Laurent Destailleur
897b3f7b79
Fix setup
2018-03-11 00:31:26 +01:00
Laurent Destailleur
64f21b8a3c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
BENKE Charlene
923bad4da6
add sql log on install debug
...
new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
2018-03-10 23:59:34 +01:00
Maxime Kohlhaas
c008853842
Fix #8057
2018-03-10 23:05:33 +01:00
Laurent Destailleur
d00b549f91
Remove duplicate perm
2018-03-10 12:46:45 +01:00
Laurent Destailleur
6ff3ac82c6
Merge pull request #8309 from ATM-Marc/NEW_syslog_file_autoclean
...
NEW: syslog file autoclean
2018-03-09 22:34:30 +01:00
Laurent Destailleur
d858426b7b
Update modSyslog.class.php
2018-03-09 22:33:39 +01:00
Marc de Lima Lucio
d6b4bc14e4
NEW: syslog file autoclean
2018-03-09 16:52:06 +01:00
Regis Houssin
3eeeaf2d2d
Fix: REST API must be enabled for all entities
2018-03-09 12:54:34 +01:00
florian HENRY
f37d482331
fix warning and sql error
2018-03-09 11:37:23 +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
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
8c128a2985
Stripe has drop PHP 5.3
2018-03-07 19:28:04 +01:00
Regis Houssin
a0774d523d
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-07 15:24:23 +01:00
Laurent Destailleur
05c1150477
Fix bad links
2018-03-07 15:13:22 +01:00
Laurent Destailleur
a597dc8b11
Merge pull request #8281 from ptibogxiv/patch-10
...
NEW: add link to stripe's info in bank menu
2018-03-07 15:09:46 +01:00
Laurent Destailleur
62a339e582
Minor fix in multicurrency for supplier prices
2018-03-07 14:13:46 +01:00
Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2018-03-07 12:59:52 +01:00
Marc de Lima Lucio
dd208348c4
FIX: add planned delivery to order exports
2018-03-07 12:18:08 +01:00
ptibogxiv
afa8b37239
NEW: add link to stripe's info in bank menu
2018-03-05 19:45:55 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Laurent Destailleur
e073fa15f7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-02 14:00:27 +01:00
Laurent Destailleur
8d11f1efa1
FIX Payment mode not correctly set in donation and document
2018-03-02 12:32:49 +01:00
Laurent Destailleur
a01287b211
Fix template donation
2018-03-02 12:25:43 +01:00
Laurent Destailleur
2368cb615f
Look and feel v8
2018-03-01 11:51:25 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
1f60d9ba81
Fix travis
2018-02-25 13:14:55 +01:00
Laurent Destailleur
6c16f2af1e
Merge pull request #8226 from hregis/7.0_multicompany
...
Fix: differentiate sharing of "member" and "member_type"
2018-02-25 12:54:51 +01:00
Laurent Destailleur
029ef534d0
Clean deprecated code (property "special" removed from mod descriptor)
2018-02-25 10:55:02 +01:00
Laurent Destailleur
619e0d3792
FIX Bad var for substitution of free text
2018-02-24 14:03:27 +01:00
Laurent Destailleur
e2e0f23d29
FIX Bad var for substitution of free text
2018-02-24 14:01:52 +01:00
Laurent Destailleur
38d1fc27e0
Start to introduce common substitution rules for odt substitutions
2018-02-24 13:41:01 +01:00
Laurent Destailleur
c8078b54b5
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
2018-02-24 12:52:57 +01:00
Laurent Destailleur
03d9bf1376
Restore deprecated var
2018-02-24 12:35:36 +01:00
Laurent Destailleur
cbfe241c1b
FIX Can use odx templates that does not include lines tags
2018-02-24 12:34:15 +01:00
Laurent Destailleur
daeebae647
FIX Can use odx templates that does not include lines tags
2018-02-24 12:32:48 +01:00
Regis Houssin
4c06384197
Fix: differentiate sharing of "member" and "member_type"
2018-02-24 11:13:14 +01:00
Laurent Destailleur
812911bd44
Fix type of expense report output in PDF
2018-02-23 15:33:42 +01:00
Laurent Destailleur
f002c84a76
Fix type of expense report output in PDF
2018-02-23 15:33:00 +01:00
Laurent Destailleur
0d0451e5c7
Code comment
2018-02-21 22:43:03 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
0ff148da1f
Fix import of chart account
2018-02-21 11:22:27 +01:00
Laurent Destailleur
15ba0c3b49
Close #7989 Merge manually in existing class
2018-02-20 15:35:42 +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
7722f004c8
FIX #8153
2018-02-15 14:08:42 +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
atm-quentin
144c13998a
NEW_einstein_pdf_modules
2018-02-13 09:51:33 +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
a4f48fcfb6
Fix feature must be hidden (not stable)
2018-02-12 16:09:22 +01:00
Laurent Destailleur
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Laurent Destailleur
c03ceb2205
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-12 02:56:51 +01:00
Laurent Destailleur
eb8664e649
NEW Can export leave requests
2018-02-09 16:08:28 +01:00
atm-ph
b074f580db
Fix can't update $nblignes on beforePDFCreation if we update $object->lines
2018-02-08 16:59:17 +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
dde631c97b
Merge pull request #8149 from frederic34/patch-8
...
NEW Add delivery_time_days of suppliers in export profile
2018-02-08 14:09:33 +01:00
Laurent Destailleur
ab21769aa2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/card.php
2018-02-08 12:58:47 +01:00
Laurent Destailleur
507328d83a
Fix syntax error
2018-02-07 17:50:16 +01:00
Laurent Destailleur
37afc58c48
The module ExpenseReport use numbering rules that you can setup (like
...
other modules do). If you need to keep the hard coded numbering rule of
expenses report used in 6.0, just add constant
EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
2018-02-07 17:45:13 +01:00
Laurent Destailleur
cb5d0b1677
Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE
2018-02-07 17:43:16 +01:00
Laurent Destailleur
510fc22172
Fix expense report
2018-02-07 17:01:14 +01:00
Laurent Destailleur
d8872a412b
Fix numbering for expense report
2018-02-07 15:52:57 +01:00
atm-ph
6254e20c67
Fix position if module use pdf hook "linkedobjects"
2018-02-07 15:41:39 +01:00
Frédéric FRANCE
1cff0593f8
Update modProduct.class.php
2018-02-07 10:42:21 +01:00
Frédéric FRANCE
c39f5ed26a
Update pdf_rouget.modules.php
2018-02-07 09:00:47 +01:00
Laurent Destailleur
ea92f6beae
Fix for multicompany
2018-02-06 10:57:53 +01:00
Laurent Destailleur
930d58ab96
Fix import supplier product price vat
2018-02-06 10:03:06 +01:00
Laurent Destailleur
4cfec30f93
Start to work on PDF template for timesheet
2018-02-05 15:35:55 +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
72f6b2956a
Fix: pagination into belugo template
2018-02-05 14:31:39 +01:00
Laurent Destailleur
775085e1b8
Border of comment box
2018-02-05 14:10:24 +01:00
Laurent Destailleur
13e71306ac
Start to work on payment import
2018-02-05 02:27:48 +01:00
Laurent Destailleur
8fe773204e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Laurent Destailleur
f3700b66c6
Fix size of columns when using PRODUCT_USE_UNIT
2018-02-04 11:17:45 +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
fa3f06aaaa
Merge pull request #8123 from atm-florian/7.0
...
fix warning class declaration
2018-02-03 16:33:39 +01:00
Laurent Destailleur
756f8a1b9f
Update modules_expensereport.php
2018-02-03 16:33:27 +01:00
Laurent Destailleur
97a29e87ea
Fix pdf template baleine (pb with page breaks and long task desc)
2018-02-03 16:31:36 +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
florian HENRY
5d20af7751
fix warning class declaration
2018-02-01 16:15:57 +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
b49a7e245c
Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries
2018-01-31 20:22:19 +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
e9441f7881
Fix name of log module to avoid confusion with blocked log
2018-01-25 17:56:46 +01:00
Laurent Destailleur
3987033aab
Fix substitution in public notes of pdf
2018-01-21 20:53:36 +01:00
atm-quentin
ce29331c05
NEW Filter export model by user
2018-01-18 12:34:22 +01:00
Laurent Destailleur
3d34a839a3
Doc
2018-01-15 17:43:18 +01:00
Laurent Destailleur
e56d74f5c4
Fix generation of doc for supplier payment
2018-01-11 19:01:47 +01:00
Laurent Destailleur
0b893c11fd
Revert "Fix wrong address used into PDF model of supplier payment"
...
This reverts commit 22d92c0540
2018-01-11 18:09:05 +01:00
Laurent Destailleur
90ddfc3f7f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
2018-01-11 01:14:20 +01:00
Laurent Destailleur
0ae02d76a3
Merge pull request #8049 from fmarcet/6.0
...
Fix: Still using property ->client instead of ->thirdparty.
2018-01-11 01:03:47 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
f2b8c3c97d
Fix check of customer/supplier code
2018-01-10 18:19:54 +01:00
Ferran Marcet
d99535d9da
Fix: Still using property ->client instead of ->thirdparty.
2018-01-10 16:40:43 +01:00
atm-ph
22d92c0540
Fix wrong address used into PDF model of supplier payment
2018-01-08 15:25:18 +01:00
Laurent Destailleur
836a94fab2
Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag
...
Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
2017-12-28 07:18:57 +01:00
Laurent Destailleur
d1cfbc2906
Code comment
2017-12-22 01:03:40 +01:00
KHELIFA
d069ccdb7f
Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
...
- Fix hide payment condition for supplier proposal
2017-12-21 16:58:37 +01:00
Laurent Destailleur
2e87318b58
Fix sql error
2017-12-18 19:15:42 +01:00
Laurent Destailleur
9f2a42b67d
NEW Can filter on user on unalterable log
2017-12-16 21:50:58 +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
394eeb3cd9
Fix rendering MD files of images by adding a css
2017-12-16 15:11:40 +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
9a08ee269e
Menu not visible
2017-12-14 23:43:04 +01:00
Laurent Destailleur
4a9b61047f
Filter on blockedlog
2017-12-14 17:08:43 +01:00
Laurent Destailleur
e3dcff7f5b
Fix substition for menus title and urls
2017-12-09 15:35:01 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
alexis Algoud
62cd77d999
NEW automatic activation of external module on country set
2017-12-08 10:13:03 +01:00
Alexis Algoud
ad46bf9a94
NEW option to avoid countries to disable there blockedlog
2017-12-05 18:30: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
1ce155728f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/mailings/fraise.modules.php
2017-12-01 16:25:13 +01:00
Laurent Destailleur
09e611aa21
Move status of blockedlog to experimental
2017-12-01 13:41:37 +01:00
ptibogxiv
c194538609
Update fraise.modules.php
2017-11-29 10:45:16 +01:00
ptibogxiv
883c9dbf99
Fix for multicompany
...
last fix for multicompany compliance
2017-11-29 09:28:03 +01:00
Laurent Destailleur
3b98a06ebb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/mailings/fraise.modules.php
2017-11-28 12:18:01 +01:00
Laurent Destailleur
07bdd3213a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-28 12:16:13 +01:00
Laurent Destailleur
f8d6897888
Fix bug
2017-11-28 12:08:04 +01:00
ptibogxiv
10b0eafba7
Update fraise.modules.php
2017-11-27 18:12:52 +01:00
ptibogxiv
ea9071512d
Update fraise.modules.php
2017-11-27 17:08:15 +01:00
ptibogxiv
0a5a50263d
fix for multicompany
2017-11-27 16:07:40 +01:00
ptibogxiv
a9e4fcfdca
Update fraise.modules.php
2017-11-27 15:49:28 +01:00
ptibogxiv
780e8ce470
fix for multicompany
2017-11-27 15:13:14 +01:00
Laurent Destailleur
f9e99e93c3
Fux utf8 trouble on direct printing message
2017-11-27 14:34:29 +01:00
Laurent Destailleur
43c60ec224
Fix error management at wrong place
2017-11-27 13:45:59 +01:00
Laurent Destailleur
7ea96d53a2
Minor fixes
2017-11-24 18:12:01 +01:00
Laurent Destailleur
63d2d38c5f
Fix export stock with lot
2017-11-24 17:47:40 +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
0370368d04
Restore lost field during merge
2017-11-24 16:46:50 +01:00
Laurent Destailleur
d7f5f14f46
Merge branch 'develop' into new_export_stock_valo
2017-11-24 16:40:36 +01:00
Laurent Destailleur
aa2397ff1d
Merge pull request #7859 from vvnt/patch-9
...
modPropale.class.php permissions in English
2017-11-24 16:34:02 +01:00
Laurent Destailleur
8bd2707678
Merge pull request #7858 from vvnt/patch-8
...
modFacture.class.php permissions in English
2017-11-24 16:33:42 +01:00
Laurent Destailleur
a18824050c
Merge pull request #7857 from vvnt/patch-7
...
modSociete.class.php permissions in English
2017-11-24 16:33:22 +01:00
Laurent Destailleur
438a68968f
Fix regression
2017-11-24 16:28:24 +01:00
Maxime Kohlhaas
cad2fedf70
New add pmp and cost price in product stock export
2017-11-23 18:41:48 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
295b4483d4
Enhance the repair.php tool
2017-11-23 13:23:16 +01:00
vvnt
09f4abd38e
modPropale.class.php permissions in English
2017-11-22 23:22:43 +01:00
vvnt
10ba9a2fee
modFacture.class.php permissions in English
2017-11-22 23:16:15 +01:00
vvnt
1b646f755d
modSociete.class.php permissions in English
2017-11-22 23:11:36 +01:00
Laurent Destailleur
5fa8db1650
Work on timesheets
2017-11-22 21:19:40 +01:00
Laurent Destailleur
d2b3fc5813
Merge pull request #7849 from IonAgorria/resources-card
...
NEW: Merge resource/add.php to resource/card.php
2017-11-22 11:33:56 +01:00
Laurent Destailleur
30d0c4f210
Merge pull request #7845 from vvnt/patch-6
...
modSociete.class.php (spelling correction)
2017-11-22 11:33:03 +01:00
Laurent Destailleur
918a51b9da
Merge pull request #7844 from vvnt/patch-5
...
modPropale.class.php (spelling correction)
2017-11-22 11:28:25 +01:00
Ion
7c6622f5b3
Merge resource/add.php to resource/card.php
2017-11-21 20:12:55 +01:00
vvnt
c74eef03dd
modSociete.class.php (spelling correction)
...
Minor spelling correction.
2017-11-21 15:17:02 +01:00
vvnt
005be3f69b
modPropale.class.php (spelling correction)
...
Minor spelling correction
2017-11-21 15:13:13 +01:00
vvnt
98998a7060
Update modFacture.class.php
2017-11-21 15:07:53 +01:00
Laurent Destailleur
7349b5d793
Fix php 7.2
2017-11-17 17:23:56 +01:00
Laurent Destailleur
2705030006
Code comment
2017-11-17 15:34:15 +01:00
Laurent Destailleur
2cb190fc5c
Fix return code
2017-11-17 15:27:59 +01:00
Laurent Destailleur
c527189088
Standardize page name
2017-11-16 12:18:25 +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
a2c80a704f
Code comment
2017-11-13 19:06:58 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
atm-ph
2636c2470b
Fix width of payment term is to large
2017-11-10 10:52:58 +01:00
Laurent Destailleur
45fc5701ae
NEW Add a profile to import product translations
2017-11-06 12:59:58 +01:00
Laurent Destailleur
8429de031f
Code comment
2017-11-06 11:32:02 +01:00
Laurent Destailleur
32303d30fa
Fix search on special char in module list
2017-10-31 10:46:23 +01:00
Laurent Destailleur
a40bebec40
Fix translation of module descriptions
2017-10-27 13:06:14 +02:00
Laurent Destailleur
6b65a9ac56
Fix position of resource menu
2017-10-24 09:58:32 +02:00
Laurent Destailleur
812687e10c
FIX Restore feature to enable a module during CLI upgrade
2017-10-22 16:08:52 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Laurent Destailleur
cad44ee68a
FIX substitution in ODT of thirdparties documents
2017-10-22 01:25:59 +02:00
Laurent Destailleur
1426737a26
Work on website
2017-10-21 12:26:14 +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
6165bcdbd0
NEW Can export list of stock movements
2017-10-20 14:52:01 +02:00
Laurent Destailleur
d82af57b57
NEW Add tab "Expense report" on user card
2017-10-19 20:56:23 +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
1e7f726168
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-11 12:21:52 +02:00
Laurent Destailleur
99afa3a3e0
Use a shorter key for column title
2017-10-11 12:19:44 +02:00
Laurent Destailleur
f23a82b9a7
Merge pull request #7614 from dolibarr95/patch-25
...
Fix : translation error
2017-10-11 11:57:51 +02:00
Laurent Destailleur
e644f7df58
Merge pull request #7597 from hregis/develop_member
...
NEW add company alias name when create company from member
2017-10-11 11:31:55 +02:00
dolibarr95
1b3f746ce0
Fix translation error
...
InvoiceProForma translation is available in bills.lang
2017-10-11 11:16:01 +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
Regis Houssin
e2206d9bf2
Fix: uniformize substitution tags
2017-10-09 16:33:22 +02:00
Maxime Kohlhaas
8513ddb9b4
Fix : missing new target type in advance target selection
2017-10-08 10:08:49 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
f9d9642340
FIX #6981
2017-10-06 14:07:28 +02:00
Laurent Destailleur
e644d9d53f
Fix syntax code
2017-10-06 01:49:07 +02:00
Laurent Destailleur
801a5180d6
Fix scrutinizer bug reports
2017-10-06 01:16:19 +02:00
Regis Houssin
1cee16a802
Fix: minimal num, maj and special character with value 0 not work
2017-10-04 18:32:52 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
1f11dcb4bd
Fix no loose of configuration of action auto after upgrade Close #7527
2017-10-03 17:21:18 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
0feae17ef5
Fix file not always defined
2017-09-30 11:51:34 +02:00
Laurent Destailleur
537a551bb5
Fix vat visiblity on pdf
2017-09-27 21:58:42 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
6b9e754221
Merge pull request #7496 from papoteur-mga/rapports_paiements
...
Rapports paiements
2017-09-26 20:02:09 +02:00
Laurent Destailleur
0dfbc8d72f
doxygen
2017-09-26 16:03:08 +02:00
Laurent Destailleur
e140878458
NEW Can import local tax rates in prices
2017-09-26 13:00:09 +02:00
Papoteur
cc9954e95e
Clean debug messages
2017-09-26 12:51:14 +02:00
Papoteur
50d639f1fa
Add total and subtotal in payments reports
2017-09-26 12:10:51 +02:00
Papoteur
cbe1683fe7
Invoice number on one line instead of two (issue#7487)
2017-09-26 11:30:28 +02:00
Papoteur
d2c55ea07b
Factorize code between payments reports client/provider
2017-09-26 11:27:53 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
77d1a15016
Activate warning for french "Loi Finance 2016"
2017-09-19 12:03:48 +02:00
Laurent Destailleur
0355b0d9ed
Merge pull request #7414 from aspangaro/7.0-4
...
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
279988bd60
Remove warning
2017-09-16 12:45:54 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2017-09-16 12:11:18 +02:00
Alexandre SPANGARO
c2e1e2491d
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-16 06:53:29 +02:00
Laurent Destailleur
bb6b3db0ac
FIX Position of signature on strato template
...
Conflicts:
htdocs/core/modules/contract/doc/pdf_strato.modules.php
2017-09-16 00:50:54 +02:00
Laurent Destailleur
f4de75afc3
FIX Position of signature on strato template
2017-09-16 00:49:00 +02:00
Laurent Destailleur
3c9532841f
Fix regression db => this->db
2017-09-15 19:37:23 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
dbb50d7b16
Fix PHP 7.2
2017-09-14 11:56:43 +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
e0eef2080e
FIX PDF output was sharing 2 different currencies in same total
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.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
2017-09-13 18:13:43 +02:00
Laurent Destailleur
60078300b8
FIX PDF output was sharing 2 different currencies in same total
2017-09-13 17:57:41 +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
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Regis Houssin
67e9b65a2e
Fix: use $array_key value instead
2017-09-09 17:07:08 +02:00
Regis Houssin
db02c32a9f
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3
2017-09-09 12:14:22 +02:00
Laurent Destailleur
8b20c5edab
FIX Remove warning when using log into syslog
2017-09-08 15:46:06 +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
Regis Houssin
d4c20a919d
Fix: avoid warning
2017-09-08 12:52:56 +02:00
Laurent Destailleur
c546243f00
Merge pull request #7328 from Dolibarr/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2017-09-07 17:56:24 +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
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +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
9cc344f8cc
Fix problem in type and customer code substitution in numbering module
2017-09-06 10:11:07 +02:00
fappels
5a75e14a8a
Add supplier qty and supplier discount for export
2017-09-05 22:50:34 +02:00
Scrutinizer Auto-Fixer
c2d32aaf18
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-09-04 10:42:51 +00:00
Laurent Destailleur
ca93be5eed
Fix priority of crons
2017-09-03 02:40:00 +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
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
8f34de1036
NEW Can include tag {uuu} into some numbering masks to replace with user
2017-08-29 19:44:35 +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
d96a83adac
Fix bad total included tax when mutlicurrency is on
2017-08-29 16:37:00 +02:00
Laurent Destailleur
7218a9de0e
Fix translation of total VAT
2017-08-29 13:52:24 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
1b1ce4fdf5
Code comment
2017-08-27 19:40:43 +02:00
Laurent Destailleur
f33289ed6a
Better examples
2017-08-27 19:15:06 +02:00
Maxime Kohlhaas
350b24f32b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering
2017-08-27 17:53:19 +02:00
Maxime Kohlhaas
9eeacd8982
Fix const name
2017-08-27 10:58:01 +02:00
Maxime Kohlhaas
61fadfd0e1
New numbering module for expense report + admin setup
2017-08-27 10:49:51 +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
BENKE Charlene
831947b6d1
Little cleaning code
...
$bottomlastpage is same in two case
2017-08-26 16:37:32 +02:00
Laurent Destailleur
a9e7f8b9e6
Fix trans
2017-08-25 21:27:19 +02:00
Laurent Destailleur
54cc1ac800
Merge emailing target selectors.
2017-08-25 21:20:27 +02:00
Regis Houssin
ad39c30c21
Fix: change old email
2017-08-23 21:23:18 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
9cd5c8a564
Code comment
2017-08-22 18:34:58 +02:00
Laurent Destailleur
2104ab9aed
Disable event reminder
2017-08-21 13:11:29 +02:00
Laurent Destailleur
fe724a2e69
Fix syntax error
2017-08-21 12:35:43 +02:00
Laurent Destailleur
260beed512
NEW Generated files are now indexed in database
2017-08-18 23:19:55 +02:00
Laurent Destailleur
4d46b2ae58
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/filefunc.inc.php
2017-08-17 22:21:30 +02:00
Laurent Destailleur
0dd5bcde40
Merge pull request #7135 from apachler/develop
...
NEW Added functionality to get order customer contact as contact_xx tags
2017-08-17 18:28:23 +02:00
Laurent Destailleur
d37d1a033a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/core/lib/admin.lib.php
htdocs/install/mysql/migration/repair.sql
2017-08-11 19:56:17 +02:00
fappels
34153eec7f
Add reading of picture paths
2017-08-07 22:36:12 +02:00
fappels
7fc359df5d
Fix pic position when VAT column hidden
2017-08-07 21:48:01 +02:00
fappels
3ef4b0fd2b
Add pictures to pdf muscadet
2017-08-07 21:47:45 +02:00
fappels
ea5dcbf611
Fix constant to show pics and remove pics column line
2017-08-07 21:35:30 +02:00
Laurent Destailleur
fd38a55f51
FIX amount overlap other amount when a pagebreak is done due to an image
...
at the bottom of page.
2017-08-07 15:49:54 +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
8a71b9e95e
Avoid creation of dir that is not indexed
2017-08-04 13:51:25 +02:00
Laurent Destailleur
f058fa1938
Better detection if a module provide triggers
2017-08-03 12:19:31 +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
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
71d49f1c6f
Fix pb in ecm
2017-08-01 18:44:34 +02:00
Laurent Destailleur
03b3f54c2c
Fix class not found
2017-08-01 13:10:15 +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
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
d8121c133e
Merge pull request #7205 from atm-quentin/6.0
...
FIX invoice situation division by zero
2017-07-31 02:23:37 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +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
Laurent Destailleur
ef3c002144
Module website not stable enough
2017-07-28 12:37:52 +02:00
Laurent Destailleur
cb5b0f3352
NEW Module "Product variants" is moved as stable.
2017-07-28 11:20:01 +02:00
atm-quentin
8451ba1f14
FIX invoice situation division by zero
2017-07-26 14:43:10 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +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
8b793a261f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2017-07-25 21:08:31 +02:00
Laurent Destailleur
6a3add6e57
Merge pull request #7196 from hregis/6.0_bug
...
Fix: translation error
2017-07-25 13:33:18 +02:00
florian HENRY
d6d454edc8
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:32:27 +02:00
Laurent Destailleur
149e1f9c67
Merge pull request #7195 from atm-florian/6.0
...
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:31:40 +02:00
Regis Houssin
88968aae22
Fix: translation error
2017-07-24 09:10:59 +02:00
florian HENRY
b9d5f4ba10
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-24 09:02:32 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Regis Houssin
2e63393bf2
Fix: wrong values if array used to force entity 0
2017-07-21 19:35:08 +02:00
Regis Houssin
48d79357a0
New: add specific translation for title of documents
2017-07-21 10:03:09 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Marc de Lima Lucio
447fdd542d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products
2017-07-18 10:30:43 +02:00
Marc de Lima Lucio
3a05b6a164
NEW add fk_unit field into product/service import/export
2017-07-18 10:20:16 +02:00
Laurent Destailleur
4fa04247a9
Finished dev
2017-07-17 11:09:32 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
e5513cff91
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2017-07-15 21:24:21 +02:00
Laurent Destailleur
4e45c7fdba
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-15 21:21:40 +02:00
Laurent Destailleur
1735a649e9
Fix permission on salary module
2017-07-15 13:02:41 +02:00
Laurent Destailleur
0763d15b4c
Debug journalization
...
Debug edition of user BAN.
2017-07-15 12:37:31 +02:00
Laurent Destailleur
de66971d93
Fix bad setup
2017-07-14 15:49:33 +02:00
Regis Houssin
f745c87394
Fix: error during upgrade process
2017-07-11 21:27:51 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Andreas Pachler
0932ebd6c8
Added functionality to get order customer contact as contact_xx tags
2017-07-10 14:09:21 +02:00
Laurent Destailleur
d223283359
Fix phpcs
2017-07-08 20:59:53 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
cf6745b1ae
Debug module builder
2017-07-08 17:08:07 +02:00
Laurent Destailleur
bcbd2a8a91
Merge pull request #7108 from atm-ph/fix_develop_import_update
...
Fix update row on xlsx import do not work as csv import
2017-07-07 20:00:28 +02:00
Laurent Destailleur
c6fc7313b1
Merge pull request #7116 from atm-ph/fix_7109
...
FIX 7109 - class name already exist for customer payment
2017-07-07 19:01:10 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
alexis Algoud
3d18c71201
FIX invoice situation VAT total rounding into PDF crabe
2017-07-05 17:21:37 +02:00
phf
31b94c1d3f
Fix 7109 - class name already exist for customer payment
2017-07-05 16:52:37 +02:00
phf
3892da7606
Fix update row on xlsx import do not work as csv import
2017-07-04 12:09:56 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
53708c138a
Add option to be able to debug problem of apache lock page
2017-07-01 16:52:28 +02:00
Laurent Destailleur
ea504a0516
FIX We should be able to insert data with value '0' into const
2017-06-30 11:10:05 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
BENKE Charlene
b17937ce0d
Error fields and add date end on rapport pdf
...
percentage instead percent
2017-06-28 21:29:01 +02:00
Maxime Kohlhaas
cef5c0b375
Fix column position in PDF when VAT is hidden
2017-06-28 00:38:24 +02:00
Maxime Kohlhaas
3664956b8c
Update pdf_azur.modules.php
2017-06-28 00:31:33 +02:00
Laurent Destailleur
7e6e0ee3a4
Fix link to image of MD files
2017-06-27 20:02:46 +02:00
Laurent Destailleur
08af9bf365
List before
2017-06-27 10:37:00 +02:00
Laurent Destailleur
3fdfebf7ef
Fix position of top menu does not follow 'position' field.
2017-06-27 04:25:41 +02:00
BENKE Charlene
03cb850442
$forceimgscaleheight instead $forceimgscalewidth
2017-06-24 20:48:11 +02:00
Laurent Destailleur
b0c5616ff0
Fix in the way markdown README and ChangeLog are output on module page.
2017-06-24 16:01:18 +02:00
Laurent Destailleur
81a473d547
Warning not required for the moment
2017-06-23 23:40:02 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
efe5d79a86
Work on #6958 . Only one type of invoice supported for supplier invoices
2017-06-20 12:58:43 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
24f7128742
Fix pb with postgresql
2017-06-19 21:04:46 +02:00
Inovea Conseil
85efe6ef74
Add import fields for societe rib
...
Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice.
But we must copy the translation of banks.lang in bills.lang are there an other solution ?
2017-06-19 11:32:11 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +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
1c8daf9700
Standardize and debug code of module BlockedLog
2017-06-16 12:46:15 +02:00
Laurent Destailleur
097be322a6
Modify code to match new v6 structure.
2017-06-15 19:29:00 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
c088ccea32
Fix better management of export of extrafield computed.
2017-06-13 18:50:31 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Regis Houssin
8b0354cfdf
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-06-11 16:43:31 +02:00
Laurent Destailleur
5471170a97
Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW blockedlog hash and authority
2017-06-11 15:54:47 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
36b18f0300
Save MAIN_VERSION_FIRST_INSTALL that is not erased.
2017-06-10 22:11:12 +02:00
atm-ph
0d24df9ffc
Fix 6939 new path for pictures is not used
2017-06-10 14:40:17 +02:00
Alexis Algoud
3d5899edf3
final blockedlog init
2017-06-10 09:25:32 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
66420d0e80
Restore lost file and better generation of modules
2017-06-02 23:02:48 +02:00
Laurent Destailleur
7ad92c3a4d
Fix new generic substitution system
2017-06-01 13:32:20 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
5cb38ece19
Fix travis errors
2017-05-21 19:37:15 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
4e7353f8a0
Clean code
2017-05-19 13:39:00 +02:00
Laurent Destailleur
88fc7dbc3e
Fix remove warning
2017-05-18 19:24:44 +02:00
Laurent Destailleur
4a46480ef5
Fix preview of PDF contract
2017-05-18 12:40:20 +02:00
Laurent Destailleur
998254d9c6
Finish rewrite and debug of module Stripe.
2017-05-14 16:17:23 +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
6f9e67b1fb
Remove no more used constant
2017-05-13 13:08:25 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
cd72c50356
Merge pull request #6799 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2017-05-11 00:04:12 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
823e5b48e3
Code comment
2017-05-10 18:56:18 +02:00
BENKE Charlie
d570df5089
inverted value between FRST & RECUR
2017-05-10 18:17:28 +02:00
Thomas Raschbacher
70de54e97d
fix project extrafields for ODT
...
for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
2017-05-10 15:21:53 +02:00
Thomas Raschbacher
267e66abfa
Add more fields to projectcontacts substitution
...
civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
2017-05-10 08:48:28 +02:00
Laurent Destailleur
cf04e5a6e0
Fix duplicate id
2017-05-09 10:45:49 +02:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Scrutinizer Auto-Fixer
d93552c8c5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-05-05 17:13:29 +00:00
Laurent Destailleur
d60e98a797
No payment information on a supplier proposal by default.
2017-05-05 13:50:14 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +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
alexis Algoud
12e91f1c1b
fix rights inventory only for MAIN_LEVEL_FEATURES = 2
2017-05-02 15:25:30 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Marcos García de La Fuente
7ae405a254
Corrected PHP7 warnings for several PDF document models
2017-05-02 14:08:20 +02:00
Marcos García de La Fuente
6e7fddee7d
Corrected PHP7 warnings for function pdf_einstein::write_file
2017-05-02 14:07:04 +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
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +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
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
10e2b128d1
Fix warning during install
2017-04-24 05:20:45 +02:00
Laurent Destailleur
65fec95458
Fix debian package
2017-04-24 04:17:59 +02:00
Alexandre SPANGARO
3b626b75c4
Update works
2017-04-22 06:58:44 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
Laurent Destailleur
cfc31e91e8
FIX overwrapping of weight/volume on rouget template
2017-04-18 18:13:43 +02:00
florian HENRY
a52db08cd6
NEW : Add module resources import/export
2017-04-18 15:25:04 +02:00
Alexandre SPANGARO
d0e27f67e7
Add plugins Stripe
2017-04-18 05:44:08 +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
7354cb148a
Fix scrutinizer
2017-04-15 03:13:17 +02:00
Laurent Destailleur
8c07f514c8
Add php unit tests on expense reports
2017-04-14 16:51:30 +02:00
Laurent Destailleur
c7160ad2b9
Avoid warning
2017-04-14 14:19:21 +02:00
Laurent Destailleur
62394abb8b
Introduce skeleton for a collab module. Volunteer wanted.
2017-04-14 14:11:52 +02:00
Laurent Destailleur
e6e9b65594
NEW Reduce memory usage by removing deprecated constant loading.
2017-04-14 12:38:52 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
d49d264bec
Merge pull request #6608 from LordVan/patch-2
...
NEW Add phone numbers of project contacts as ODT vars
2017-04-01 00:30:28 +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
141ef91dea
Fix default auto events
2017-03-30 11:53:58 +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
Thomas Raschbacher
a76ddc8b3f
Add phone phone numbers to project contacts
...
Add phone number(s) for project contacts to be used in odt
2017-03-29 15:33:32 +02:00
phf
c3e8a5be62
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-28 17:20:50 +02:00
Laurent Destailleur
219bcb0d54
Work on 6.0 features.
2017-03-27 22:44:50 +02:00
Laurent Destailleur
8c2b70c4a7
Fix filechecker
2017-03-25 20:51:02 +01: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
atm-ph
21e30e43d9
Update entries menus
2017-03-25 19:10:16 +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
f241bfefd0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 20:20:59 +01:00
Laurent Destailleur
be0d5bee78
Fix phpcs
2017-03-23 20:07:46 +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
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
Laurent Destailleur
b5e646daa0
NEW Show by default README.md file found into root dir of ext module.
2017-03-21 16:43:09 +01:00
Laurent Destailleur
a5c11dc840
NEW Add function dolMd2Html
2017-03-21 16:03:13 +01:00
Laurent Destailleur
1b0b4c9609
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
ac19aba07e
FIX multicurrency management on supplier order/invoice
...
Conflicts:
htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
2017-03-19 15:41:55 +01:00
Laurent Destailleur
e85206dee5
FIX multicurrency management on supplier order/invoice
2017-03-19 15:37:07 +01:00
Alexandre SPANGARO
16b12b33fc
First step : remove BANK_DISABLE_DIRECT_INPUT
2017-03-18 07:24:55 +01:00
Laurent Destailleur
35b79818b7
Uniformize css rules
2017-03-16 20:33:51 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Laurent Destailleur
d3e1a01273
Translation
2017-03-13 02:12:18 +01:00
Laurent Destailleur
520bdac510
Translation
2017-03-13 01:35:04 +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
8f338a155a
Fix last_insert_id at a better place
2017-03-10 15:19:15 +01:00
Laurent Destailleur
fd3837e1d5
Merge pull request #6492 from aspangaro/6.0-donation
...
NEW Add donations statistics in home statistics
2017-03-10 12:31:46 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
arnaud
1d31603ad2
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo
2017-03-10 11:46:59 +01:00
Laurent Destailleur
e44234a47f
NEW add property to show warnings when activating modules
2017-03-09 15:16:45 +01:00
Laurent Destailleur
c962daabac
NEW add property to show warnings when activating modules
2017-03-09 15:16:16 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
Alexandre SPANGARO
fd0a46c5cf
New : add donations statistics in home statistics
2017-03-07 22:31:34 +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
2a1060c0fc
Merge pull request #6475 from defrance/patch-87
...
Situation total row left a col if bank enabled
2017-03-05 21:39:02 +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
arnaud
cff9fa0e6b
FIX user odt
2017-03-03 12:01:58 +01:00
BENKE Charlie
83622c62be
Update pdf_crabe.modules.php
2017-03-01 21:54:30 +01:00
BENKE Charlie
a371b27564
better management of situation progress in pdf
2017-03-01 16:48:09 +01:00
Laurent Destailleur
3c54cb5ba9
Fix avoid trigger during migration
2017-02-28 20:55:14 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +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
63bee0c2d0
Doxygen
2017-02-24 16:23:43 +01:00
Laurent Destailleur
d0ee8c0e2d
Merge pull request #6458 from defrance/patch-83
...
inverted value between FRST & RECUR
2017-02-24 15:27:32 +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
BENKE Charlie
299551f851
inverted value between FRST & RECUR
2017-02-22 15:59:10 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Alexandre SPANGARO
942b58efaf
New : Integration of Stripe
2017-02-22 06:33:52 +01:00
Laurent Destailleur
89b52e24f6
Fix menu navigation
2017-02-22 02:41:21 +01:00
Laurent Destailleur
7ab600781d
NEW Move login information on home page into a widget
2017-02-21 11:57:52 +01:00
arnaud
26b8112d4e
FIX travis check
2017-02-20 09:22: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
afa5ef2913
NEW Introduce fields that can be computed during export in export
...
profiles.
2017-02-17 00:19:28 +01:00
Laurent Destailleur
c3d78bf1b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
2017-02-16 22:09:37 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
f5569ee890
Add tasktime_task_duration_sec tag in odt substitution
2017-02-11 13:50:30 +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
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Laurent Destailleur
d463511cff
Fix: no way to know type of invoice.
2017-02-10 17:24:47 +01:00
Laurent Destailleur
5d94c8ddac
Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement
...
[FIX] - Expense report on multiple page
2017-02-08 19:34:16 +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
De Coninck Laurent
a042c30b28
fix nex line
2017-02-08 19:00:48 +01:00
Ion
22b85b3aba
Show delay in syslog
2017-02-08 17:30:51 +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
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
Laurent Destailleur
4c3255857c
Fix bad syntax into criteria to filter on date in export.
...
Fix missing type in export of invoices.
2017-02-08 10:45:20 +01:00
De Coninck Laurent
49e6192e62
fix the type width column and the nextY
2017-02-08 09:23:15 +01:00
Alexandre SPANGARO
e4fc52497e
New : [FP17] Accountancy - Add export of charts of accounts
2017-02-08 06:18:56 +01:00
Laurent Destailleur
2d77cb2da5
FIX #6379
2017-02-07 00:54:54 +01:00
Laurent Destailleur
8f52a34e71
Report of supplier payment is name "supplier_payments"
2017-02-06 20:37:42 +01:00
arnaud
7f6ab748c5
NEW add rapport file for supplier paiement
2017-02-03 16:42:06 +01:00
arnaud
6d3e43ddaf
NEW Report page and menu for suppliers paiements
2017-02-03 16:34:14 +01:00
Laurent Destailleur
bdca134e99
NEW Change to allow a specific numbering rule for invoice with POS
...
module.
2017-02-02 23:49:17 +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
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
5e4509953d
Associated product must be on another export profile
2017-01-29 21:25:29 +01:00
Laurent Destailleur
b4b81d8dcb
Fix css and missing translation key
2017-01-29 15:07:18 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-27 01:24:55 +01:00
Laurent Destailleur
8a4e957554
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-01-27 01:23:44 +01:00
Laurent Destailleur
4c28e1598b
Merge branch '5.0' into 5.0
2017-01-27 00:25:12 +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
c1b59b1950
Fix several security bugs on expense report
2017-01-26 18:08:00 +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
Laurent Destailleur
9889f0a4a2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modProjet.class.php
htdocs/filefunc.inc.php
2017-01-26 10:44:50 +01:00
Laurent Destailleur
eac6ac0247
Fix fields into projet export
2017-01-26 10:41:02 +01:00
Ferran Marcet
0df39149c4
Fix: Hidden option not showing correctly
2017-01-25 19:28:20 +01:00
fappels
2be6011069
Fix product elephant verify for service
2017-01-23 20:59:32 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
9a5670787f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-21 12:26:50 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Laurent Destailleur
0a4b29e1c4
Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation
...
Fix pdf invoice with situation
2017-01-20 18:10:24 +01:00
Juanjo Menent
2374aa351e
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-20 15:55:51 +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
gauthier
a944c82d86
FIX : $progress_width initialized
2017-01-19 09:11:06 +01:00
Laurent Destailleur
227b616ca3
Fix bad default value
2017-01-18 16:51:42 +01:00
Laurent Destailleur
ed98227303
Merge pull request #6292 from marcosgdf/remove-pdf-create-functions
...
NEW Removed deprecated pdf_create functions
2017-01-18 16:48:23 +01:00
Laurent Destailleur
82492dc023
Fix oauth2 token generation for Google. The refresh token was not
...
received.
2017-01-17 20:05:10 +01:00
Laurent Destailleur
16779be162
Fix missing email/multicompany field
2017-01-17 10:51:30 +01:00
Laurent Destailleur
1ded1bd52a
Fix: missing email
2017-01-17 10:34:35 +01:00
Marcos García de La Fuente
8225b06018
NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions
2017-01-16 21:59:02 +01:00
Philippe GRAND
2525a6e3a4
update code for next php versions
2017-01-16 17:24:50 +01:00
Laurent Destailleur
1b1bab94ca
More complete commit for #6114
2017-01-16 10:43:22 +01:00
Laurent Destailleur
9d72f1df62
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 01:12:11 +01:00
Laurent Destailleur
a07a77e323
Not yet ready for php 7.1
2017-01-16 01:11:38 +01:00
Laurent Destailleur
d95ac3bbdd
Fix warning
2017-01-16 00:16:20 +01:00
Laurent Destailleur
7bccaff28a
Fix remove warnings
2017-01-15 23:32:14 +01: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
Juanjo Menent
6cc3ef0c99
NEW: Events notifications in browser
2017-01-13 16:08:49 +01:00
gauthier
a90ec7a8c7
FIX : hidetop progression
2017-01-13 14:59:29 +01:00
gauthier
1886e68731
FIX : progress size
2017-01-12 17:07:22 +01:00
gauthier
307c06dfc3
FIX : pdf invoice when we use situation
2017-01-12 16:26:09 +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
25dcb10c1d
Merge pull request #6066 from atm-florian/dev_exportthirdparty
...
NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)
2017-01-12 11:17:15 +01:00
Laurent Destailleur
7476a3c8ae
Fix error during migration
2017-01-12 10:59:27 +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
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
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +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
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
Marcos García de La Fuente
98599b0bbf
FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish
2016-12-27 12:56:49 +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
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
Laurent Destailleur
8ce5ed0192
Fix position of discount on PDF with US letter format
2016-12-23 15:57:31 +01:00
Laurent Destailleur
9948b6d4d9
Merge pull request #6202 from GPCsolutions/supplierpaymentdateexport
...
NEW: Export max payment date with supplier invoices
2016-12-23 00:50:30 +01:00
Laurent Destailleur
594ecf400b
Merge pull request #6196 from aspangaro/5.0-b12
...
Fix: Travis
2016-12-23 00:44:16 +01:00
Laurent Destailleur
77c320a092
Fix warning for expense report late
2016-12-22 15:33:43 +01:00
Raphaël Doursenaud
590fcf8399
NEW: Export max payment date with supplier invoices
2016-12-20 18:32:57 +01:00
Laurent Destailleur
3c79f3acb5
Minor fixes or code comment
2016-12-20 12:06:26 +01:00
aspangaro
9901aaa9fe
Try to correct travis public underscore problem
2016-12-19 06:34:17 +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
0e7da2cd22
FIX Label of project is in field title not label.
2016-12-18 11:55:30 +01:00
Laurent Destailleur
d8e394d3aa
FIX Missing field
2016-12-16 17:09:15 +01:00
Alexis Algoud
79867a85d0
fix list issue
2016-12-16 16:09:02 +01:00
Alexis Algoud
4d375bcf95
debug translate
2016-12-16 11:31:14 +01:00
Alexis Algoud
b7a6a71dff
move file to core
2016-12-15 17:20:46 +01:00
Gustavo Novaro
da7a4a9283
Replace var to public
...
Improve code style
2016-12-15 10:31:46 -03:00
Alexis Algoud
703b8708e3
fix create
2016-12-15 10:39:59 +01:00
florian HENRY
a99ac7fb6b
taking account @eldy remarks
2016-12-13 16:52:49 +01:00
florian HENRY
2f138c0c37
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty
2016-12-13 16:49:39 +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
Maxime Kohlhaas
4296a2802c
Wrong menu in tab link on user card
2016-12-11 14:27:10 +01:00
Maxime Kohlhaas
5ed041c0cd
Rights should not be given by default
2016-12-11 14:11:28 +01:00
florian HENRY
a797c45e3b
sdf
2016-12-09 16:28:06 +01:00
florian HENRY
101afeeb73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty
2016-12-09 16:18:36 +01:00
florian HENRY
1e39805945
integrate Eldy remarks
2016-12-09 16:14:43 +01:00
Laurent Destailleur
455a9ed4da
FIX security in import of files
2016-12-07 12:41:48 +01:00
Laurent Destailleur
db9af0118c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2016-12-06 14:08:43 +01:00
Laurent Destailleur
cfff6a8cb8
FIX Export of opportunity status must be code, not id.
2016-12-06 14:05:43 +01:00
Laurent Destailleur
0d7ab3301b
FIX in export. Error when using a separate extrafields.
2016-12-06 11:52:07 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
florian HENRY
c1652169f2
NEW : Add in export thirdparty for user limit on view thirpdarty to
...
sales team also to subsidiaries
2016-11-30 16:09:59 +01:00
Alexis Algoud
360c952e5a
FIX column too small, header on 2 lines
2016-11-29 09:50:55 +01:00
Marcos García de La Fuente
91be05932e
Added missing modAttributes file
2016-11-27 21:50:27 +01:00
Laurent Destailleur
ce10dc618c
Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact
...
FIX missing extrafields of thirdparty on contact export
2016-11-27 15:20:14 +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
florian HENRY
8ea49d8887
add extrafields thirdparty on contact export
2016-11-25 10:55:09 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
52fac193ad
MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE does not works as it needs the add
...
contact manually. Quick hack added to use the creator instead.
2016-11-23 11:50:01 +01:00
IJ
9f28795159
Add Unique Top Menu Translation
...
Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
** Requires re-enabling module
2016-11-19 11:29:35 +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
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
d197a0e0aa
NEW Can create expense report for someone else (advanced permission)
...
NEW Can clone an expense report
2016-11-13 22:01:22 +01:00
Laurent Destailleur
ee14eab802
Multi devise
2016-11-13 18:47:10 +01:00
Laurent Destailleur
0f1b34f556
Fix code unreachable
2016-11-13 18:17:49 +01:00
Laurent Destailleur
fe1c83b206
Fix code not reachable
2016-11-13 18:15:31 +01:00
Maxime Kohlhaas
edef8f883b
Add update option on product module
2016-11-13 09:40:09 +01:00
Maxime Kohlhaas
1dcecf4873
Fix select and update done check
2016-11-13 09:32:43 +01:00
Maxime Kohlhaas
5f704fe5e5
Import update, new way of working with a select
2016-11-13 09:03:34 +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
aspangaro
c65678d00a
Update cactus numbering model
2016-11-11 07:36:26 +01:00
aspangaro
60219fa84d
Update tulip model
2016-11-11 07:06:45 +01:00
Laurent Destailleur
52080fb917
Fix code not reachable
2016-11-08 20:06:50 +01:00
Laurent Destailleur
18d1878775
Debug accountancy module
2016-11-06 13:07:49 +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
BENKE Charlie
7be49e47b8
indenting and little refactoring
2016-11-01 17:09:51 +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
Maxime Kohlhaas
be493fcf09
Fix bad parameter in hook call
2016-10-28 10:16:58 +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
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
phf
3e2f39fbc0
Fix on first activate module it must create if needed the first currency rate from general settings
2016-10-25 13:31:36 +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
ffcfe30529
FIX Avoid errors on debian
2016-10-22 16:51:54 +02:00
florian HENRY
5f3eb9097e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_resource_extrafields
2016-10-21 13:51:53 +02:00
Laurent Destailleur
c4dd689b08
Clean unreachable code
2016-10-21 11:53:41 +02:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +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
Laurent Destailleur
2db38b4bcc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/societe/list.php
2016-10-16 19:02:36 +02:00
Laurent Destailleur
b51b6fa8c8
Merge pull request #5865 from atm-florian/develop
...
NEW : Export thirdparty with payement terms and mode
2016-10-15 02:18:07 +02:00
Laurent Destailleur
4fb66cf7a4
Better explanation for ftp module setup to avoid error with FTPS/SFTP.
2016-10-15 02:11:49 +02:00
Laurent Destailleur
78182ab504
Fix sepa mandate translation
2016-10-14 17:47:05 +02:00
florian HENRY
0b78f7f101
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2016-10-14 10:05:28 +02:00
Sergio Sanchis Climent
567f7e5365
FIX : #5340
2016-10-14 00:43:10 +02:00
Laurent Destailleur
7c1b74133a
Debug accountancy module
2016-10-13 22:29:49 +02:00
florian HENRY
4e34b6e0c6
Merge remote-tracking branch 'origin/develop' into develop
2016-10-12 19:00:32 +02:00
florian HENRY
cc28391944
NEW : Export thirdparty with payement terms and mode
2016-10-12 18:59:34 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +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
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
Maxime Kohlhaas
c4b9692575
Missing comment
2016-10-03 09:46:31 +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
Laurent Destailleur
a192045be2
FIX PHPCS
2016-10-03 00:47:11 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
51df25509e
Fix conflicts on default doc template when enabling/disabling modules
2016-10-02 20:00:57 +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
5a1e96b598
FIX #5823 better multicompany support for member module
2016-10-01 18:55:37 +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
521008a698
FIX #5746 chrome php
...
Try a fix. Not sure it solved all problems reported
2016-10-01 17:27:52 +02:00
Laurent Destailleur
d079247b2b
FIX #5813 Bug: Incoterms not being read correctly
2016-10-01 13:32:24 +02:00
Laurent Destailleur
d9ff53eb7f
Fix travis errors
2016-09-30 15:22:58 +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
94dbe3da3f
Fix the info if module are provided by module or not was wrong
2016-09-30 13:02:13 +02:00
Laurent Destailleur
b412baa880
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-29 10:49:47 +02:00
Laurent Destailleur
214dc2cba0
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-09-29 10:49:00 +02:00
Laurent Destailleur
0b49d6316e
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-09-29 10:48:14 +02:00
gauthier
03d126810c
FIX : "reopen " new right must respect advanced user rights management
2016-09-29 10:15:34 +02:00
Laurent Destailleur
4702fdc8d7
Merge pull request #5805 from simnandez/develop
...
New: Add thirdparty extrafields to export thirdparty categories
2016-09-28 20:25:04 +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
Laurent Destailleur
bfd5bb37c5
Code comment
2016-09-28 18:07:31 +02:00
Juanjo Menent
b99b97573d
New: Add thirdparty extrafields to export thirdparty categories
2016-09-28 10:53:22 +02:00
Juanjo Menent
30050b51f0
FIX: Failed to export contact categories with contact extra fields
2016-09-28 10:15:41 +02:00
gauthier
ad03bdf3b9
FIX : reopen invoice is an advanced right and default value is 1
2016-09-26 17:39:46 +02:00
aspangaro
2dbeeedd14
Move tab menu for subscription in member.lib
...
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
gauthier
7ad2fda289
NEW : Reopen a paid bill is a user right
2016-09-22 15:06:39 +02:00
Laurent Destailleur
f1166f1898
Fix warning
2016-09-22 13:00:02 +02:00
Laurent Destailleur
d598e206cd
Fix warning
2016-09-22 12:56:48 +02:00
Laurent Destailleur
619b65e0b6
Fix warning
2016-09-22 11:06:39 +02:00
Laurent Destailleur
95f2cae825
Start to work on sepa mandate generation
2016-09-19 00:26:30 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
03c312e35c
Fix bad name for modules_action.php
2016-09-10 16:09:46 +02:00
Laurent Destailleur
858291c3a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-09 09:32: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
Raphaël Doursenaud
d89a877a00
Added the new familyinfo property from 4.0.0
2016-09-08 16:58:01 +02:00
Raphaël Doursenaud
f97f011cd3
Added missing properties in modules class.
...
Enhanced modules class documentation.
2016-09-08 16:37:48 +02:00
Raphaël Doursenaud
4126928804
Fixed code discrepancy
...
Most places and samples used editor_url so I opted for that.
2016-09-08 16:37:45 +02:00
Laurent Destailleur
5aaa3028a2
FIX Better position of fields in expense report PDF.
2016-09-07 01:47:09 +02:00
Laurent Destailleur
cc9230c07f
FIX Columns truncated and translation missing
2016-09-06 13:08:49 +02:00
Laurent Destailleur
8419202588
NEW Support free bottom text and watermark on expense report template
2016-09-06 12:47:18 +02:00
Laurent Destailleur
571aae7026
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 21:52:20 +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
b01d1979f8
Merge pull request #5680 from aspangaro/5.0-p7
...
NEW: Move Expense report menu from module to menu files (Again)
2016-09-02 18:39:49 +02:00
Laurent Destailleur
e62299d67e
NEW Add date into list of print jobs for Google Print.
2016-08-31 14:36:08 +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
aspangaro
b5f093436e
NEW: Move Expense report menu from module to menu files (Again)
2016-08-30 21:43:17 +02:00
Laurent Destailleur
6ddd264178
Fix not used field
2016-08-28 17:45:20 +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
Maxime Kohlhaas
5b9acef10c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_modimport_update_option
2016-08-23 10:51:00 +02:00
Maxime Kohlhaas
e6411dd246
Start work to allow updates in import module
2016-08-22 12:25:03 +02:00
Laurent Destailleur
1fc5715040
Fix date of contract not used
2016-08-20 00:30:09 +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
ba8c2dbf9f
Fix order of module for demo.
2016-08-17 11:39:11 +02:00
Laurent Destailleur
47489265b1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-17 11:15:30 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules.
...
Removed Sentry logging.
2016-08-16 03:24:04 +02:00
Laurent Destailleur
7cc7ac5485
Fix translation
2016-08-11 17:41:09 +02:00
aspangaro
26df66f9ac
Fix: Missing language file for salaries export
2016-08-10 15:11:51 +02:00
aspangaro
4e39c41215
Fix: Typo on invoice export
2016-08-10 15:07:53 +02:00
aspangaro
cdd84244b2
Fix: Missing Language file and key for category contact export
2016-08-10 14:48:26 +02:00
aspangaro
8028b77966
Fix: MIssing language file for category members export
2016-08-10 14:39:51 +02:00
aspangaro
c442ff0d2b
Fix: Missing language file for user export when the module members is on
2016-08-10 14:29:19 +02:00
aspangaro
43ffb061ef
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
2016-08-10 08:07:27 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +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
Laurent Destailleur
782ab6a02b
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/barcode/modules_barcode.class.php
htdocs/product/admin/product.php
2016-08-05 00:42:40 +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
d688681605
Use standard prefix for supplier order for new install
2016-08-04 15:45:55 +02:00
florian HENRY
5144f21c6c
FIX php Strict
2016-08-02 15:36:00 +02:00
Laurent Destailleur
4a1e263e68
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-01 15:19:25 +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
97dd1f4bbb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
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
Maxime Kohlhaas
34b4d0225e
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option
2016-07-27 09:13:29 +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
Maxime Kohlhaas
142aedc0cd
CSV import : listfields and listvalues are now arrays
2016-07-03 11:15:28 +02:00
Maxime Kohlhaas
de62e4cdb8
CSV import : refactor SQL insert construction
2016-07-03 11:11:43 +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
Laurent Destailleur
f2f672a801
FIX variable outpulang not defined
2016-04-09 15:14:27 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00: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
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Raphaël Doursenaud
9d6efde935
Prevent sentry logging error with 3.9 update
...
Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.
Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.
2016-04-07 17:16:42 +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
Laurent Destailleur
f9d7c27bd2
FIX Export must use a left join to not loose lines
2016-04-05 17:17:40 +02:00
Laurent Destailleur
dd87195a07
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93
FIX Damn, where was the project ref ?
2016-04-05 17:11:44 +02:00
Juanjo Menent
10df0e33d4
Merge pull request #4896 from grandoc/3.9
...
fix a lot of beug
2016-04-05 16:49:22 +02:00
Laurent Destailleur
2d102d3132
Bad translation key
2016-04-05 10:24:28 +02:00
Laurent Destailleur
6c87dfafae
FIX Bad translation key
2016-04-05 10:12:03 +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
Laurent Destailleur
cab1c0f5cd
Merge pull request #4886 from apachler/develop
...
Added functionality to get project customer contact as contact_xx tags
2016-04-04 00:11:19 +02:00
Juanjo Menent
e8b2d6baab
NEW #3510 : Working
2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04
NEW #3510 : Working
2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
Laurent Destailleur
10f639507f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:54:51 +02:00
Florian HENRY
038b928ea4
fix travis
2016-04-01 17:09:03 +02:00
Florian HENRY
ae51321040
Debug Advance target emailing
2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
Laurent Destailleur
a47accb1c3
FIX PMP is deprecated at warehouse level
2016-03-30 18:08:08 +02:00
Andreas Pachler
7eded39e28
Reworked functionality to get project contact as contact_xx tags
2016-03-30 08:34:32 +02:00
Laurent Destailleur
6188c3fced
NEW Introduce a predefined job to run database backup
2016-03-29 14:52:27 +02:00
philippe grand
b3285996dc
fix travis issue from commit 139dc9a7
2016-03-26 12:39:08 +01:00
Laurent Destailleur
aab7575528
FIX Problem when disabling module product or service. They both include
...
same boxes, we must not disable box if the other is still active
2016-03-26 12:28:31 +01:00
philippe grand
08970e67d7
fix a lot of beug
2016-03-25 18:16:58 +01:00
Laurent Destailleur
6aba69c69c
Merge pull request #4885 from aspangaro/4.0-p6
...
NEW: Move HRM dictionary from module to core dictionaries
2016-03-25 18:06:57 +01:00
Laurent Destailleur
bb8e53deea
Revert "Fix regression"
...
This reverts commit 5cd5a3a5fb
2016-03-25 15:57:19 +01:00
Laurent Destailleur
88e5616622
Prepare code to be able to download ODT templates
2016-03-25 15:56:50 +01:00
Laurent Destailleur
5cd5a3a5fb
Fix regression
2016-03-25 15:56:44 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Andreas Pachler
0d308f74be
Added functionality to get project customer contact as contact_xx tags
2016-03-24 09:16:24 +01:00
aspangaro
bec5e5958a
NEW: Move HRM dictionary from module to core dictionaries
2016-03-24 06:28:12 +01:00
Juanjo Menent
922c57da76
NEW #3510 : Standardize module
2016-03-23 22:45:04 +01:00
Laurent Destailleur
54ac3c0a7b
Fix regression
2016-03-22 17:41:42 +01:00
Laurent Destailleur
95a45e8f87
Prepare code to be able to download ODT templates
2016-03-22 17:35:58 +01:00
Laurent Destailleur
ced1462b75
Fix regression
2016-03-22 16:59:54 +01:00
Laurent Destailleur
4f3f1eda7b
FIX Duplicate records into export
2016-03-22 12:55:29 +01:00
Laurent Destailleur
876484dfb5
FIX Duplicate records into export
2016-03-22 12:54:26 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
aspangaro
3c09e67453
Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
2016-03-21 20:38:17 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
aspangaro
57ebb7c997
NEW: Move Expense report menu from module to menu files
2016-03-20 07:34:48 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
2c4f01859c
Merge pull request #4802 from grandoc/3.9
...
[fix]: define to avoid issue with external pdf models
2016-03-17 23:13:13 +01:00
Laurent Destailleur
aa7eb4935c
FIX VAT rate can be negative. Example spain selling to morroco.
2016-03-17 12:18:47 +01:00
Laurent Destailleur
1683609d9a
FIX Check of EAN13 barcode when mask was set to use 13 digits instead of
...
12
2016-03-17 12:00:38 +01:00
philippe grand
d434cee3fa
[Qual] Typo
2016-03-17 09:40:05 +01:00
Laurent Destailleur
12bb3932d0
NEW Add filter on a keyword, status and nature into list of modules
2016-03-14 19:40:52 +01:00
Laurent Destailleur
543f5cef63
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
1b30c1adb4
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-12 20:49:38 +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
3b035819a9
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
2016-03-10 15:03:53 +01:00
Laurent Destailleur
e0681d0165
Fix unit not visible if not defined
2016-03-09 23:20:44 +01:00
Florian HENRY
a8e2b49c5b
FIX : #4768
2016-03-08 10:22:31 +01:00
Benlo
0166d2ec3a
FR4763 add possibility to export contacts/thirdparty categories
2016-03-07 17:49:26 +01:00
Laurent Destailleur
896f60a478
hidden solution to solve files overwriting each other
2016-03-06 00:47:00 +01:00
Laurent Destailleur
210d8435da
FIX The part added with hidden option MAIN_DOC_USE_TIMING was included
...
with a . instead of -. This make os think it is part of extension
instead of file name.
2016-03-06 00:39:13 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Laurent Destailleur
c63ee8ceb5
Debug module supplier proposal
2016-03-04 16:08:51 +01:00
abb
f9162aa444
new:advanced permissions to validate and unvalidate interventions
2016-02-29 19:16:09 +01:00
Laurent Destailleur
16a716ebbc
Merge pull request #4655 from defrance/patch-103
...
ODT generation : No segment defined in odt file is not an error
2016-02-26 11:15:34 +01:00
Laurent Destailleur
54034ea852
NEW Add $object in parameter of pdf_build_address so we could include
...
hook into the function.
2016-02-25 18:30:31 +01:00
Laurent Destailleur
8c43276fda
FIX Extrafields of shipments was not included into export fields
2016-02-25 15:46:14 +01:00
Laurent Destailleur
b3c3d3aac5
NEW Add total weight and volume on PDF
...
NEW Can hide column qty ordered.
2016-02-25 14:18:32 +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
02c0f52880
NEW Include sales representative into export of thirdparties
2016-02-24 16:56:24 +01:00
Laurent Destailleur
ac6001cec8
Fix do not show warning if account defined
2016-02-23 12:44:46 +01:00
Laurent Destailleur
843dada35d
Fix translation export/import
2016-02-22 17:42:41 +01:00
Laurent Destailleur
ef497e2129
Merge pull request #4669 from peckpeck/translation_import
...
Add support to product translation imports
2016-02-22 16:17:19 +01:00
Laurent Destailleur
77cbd885f2
NEW Add minimum stock and desired stock into import/export profiles.
...
NEW Add state into thirdparty export fields
2016-02-22 15:30:27 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
e7e6957073
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7
Fix do not show warning if account defined
2016-02-22 09:27:18 +01:00
Benoît Peccatte
c969b09ef7
Add support to product translation imports
2016-02-21 22:04:47 +01:00
Laurent Destailleur
fb0e74645e
Merge pull request #4663 from peckpeck/xlsx_support
...
NEW Allow imports from xlsx files
2016-02-21 19:12:38 +01:00
Benoît Peccatte
5a8d1f1c95
Allow imports from xlsx files
2016-02-21 14:10:19 +01:00
Laurent Destailleur
277d92af75
Secure migration for people using a RC
2016-02-20 03:14:29 +01:00
Laurent Destailleur
82f57b2ccf
Better position for modules
2016-02-19 20:05:25 +01:00
Laurent Destailleur
da284cda8c
Add category Supplier Relationship Manager
2016-02-19 19:20:21 +01:00
BENKE Charlie
8349446340
No segment defined is not an error
...
This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
2016-02-19 10:59:50 +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
52c82508e4
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/charges/index.php
2016-02-18 23:27:57 +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
Regis Houssin
d55ac472c3
Fix: issue when bank module is disabled
...
Fix: missing entity filter for lines of payment
2016-02-16 11:27:58 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
0d5f30f627
Merge pull request #4589 from frederic34/patch-8
...
Update google_oauthcallback.php
2016-02-15 00:34:22 +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
51ededc794
Fix duplicate template crabe and crevette. crevette was not updated and
...
contains old code compared to crabe. To manage situation invoice with a
PDF, code must be included into crabe (with some test if invoice is a
situation invoice or not to manage if to have different code)
2016-02-15 00:02:07 +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
Laurent Destailleur
d973596601
Merge pull request #4587 from frederic34/patch-7
...
Update modOauth.class.php
2016-02-14 12:21:03 +01:00
Laurent Destailleur
ecc338b1eb
Clean module
2016-02-13 03:25:20 +01:00
Laurent Destailleur
969314e731
Fix: disabling option lead in not working dolibarr
2016-02-12 12:19:32 +01:00
Laurent Destailleur
0d7f67ade5
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-10 23:59:15 +01:00
Laurent Destailleur
e169cd3364
Fix usage of filter into selection of email members into emailing.
2016-02-10 23:48:18 +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
Frédéric FRANCE
c28f977e02
Update printgcp.modules.php
2016-02-09 14:12:34 +01:00
Frédéric FRANCE
51da5ea1f0
Update printgcp.modules.php
2016-02-09 14:07:54 +01:00
Frédéric FRANCE
73041b0be5
Update google_oauthcallback.php
2016-02-09 14:05:05 +01:00
Frédéric FRANCE
5dd016c3bc
Update modOauth.class.php
2016-02-08 17:55:29 +01:00
Laurent Destailleur
7445a0f71c
Clean code for generating sheet of barcode. Can choose output filename.
2016-02-08 16:42:34 +01:00
Laurent Destailleur
fcf1e20d5b
Merge pull request #4578 from frederic34/sticker
...
Dictionnary for label sticker and card format
2016-02-08 14:49:31 +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
philippe grand
a15d03a676
fix : Strict Standards: Only variables should be passed by reference
2016-02-08 10:06:32 +01:00
Laurent Destailleur
ad63d5c48d
NEW Move load module to status experimental
2016-02-07 22:47:16 +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
frederic34
0d11d94234
Merge remote branch 'upstream/develop' into sticker
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-06 12:12:35 +01:00
frederic34
9c74af63af
Dictionnary for label sticker and card format
2016-02-06 12:06:05 +01:00
BENKE Charlie
e2afe5460e
Update modSociete.class.php
2016-02-05 23:37:31 +01:00
Laurent Destailleur
fd7a05490d
DiscountOffered text was too long
2016-02-05 20:06:07 +01:00
phf
a8e480e392
FIX #3509 payment ref for suppliers
2016-02-04 23:15:06 +01:00
BENKE Charlie
5498b1cd5a
Update modSociete.class.php
2016-02-04 18:06:43 +01:00
BENKE Charlie
f87bfffdd9
add edition feacture on product element
2016-02-04 16:12:00 +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
547ffd7fcc
Add missing phpunit tests
2016-02-02 17:26:14 +01:00
Laurent Destailleur
d88cd500ce
Merge pull request #4547 from bafbes/dev1
...
fix:remove project info in standard document model for expense reports when project module is disabled
2016-02-02 16:41:12 +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
abb
3bcfe849a1
fix:remove project info in standard document model for expense reports when project module is disabled
2016-01-31 22:35:09 +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
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
5e9fd25a6e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-30 15:59:40 +01:00
Laurent Destailleur
d21908755e
FIX Import/Export NPR VAT
2016-01-30 15:29:35 +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
cd58c93de6
FIX If option to hide automatic ECM is on, dont show menu.
2016-01-28 12:51:34 +01:00
phf
83f90e2b1f
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/commande/card.php
2016-01-25 21:50:43 +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
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
ba833dc412
Work on CMS module
2016-01-24 21:35:41 +01:00
Laurent Destailleur
8d46a56dac
Work on CMS module
2016-01-24 21:17:11 +01:00
phf
9376699299
FIX travis missing comment for new param
2016-01-23 16:16:15 +01:00
phf
373225272b
FIX reorder the display of currency and rate on propal/order
...
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
2016-01-23 16:01:55 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
a406334643
Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification
...
FIX line refetch incompatible with hook practice
2016-01-22 04:10:06 +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
Laurent Destailleur
cc71445b45
Fix: Only one name for one same feature.
2016-01-22 02:41:51 +01:00
Laurent Destailleur
e6653ea14f
Merge pull request #4333 from defrance/patch-94
...
Parameters harmonization of hook call
2016-01-22 02:35:21 +01:00
Laurent Destailleur
219ce73ea2
Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
...
FIX nblignes not calculated after hook and hook can't modify this val...
2016-01-22 02:10:36 +01:00
phf
68857499d7
NEW display multicurrency price on azur pdf model
2016-01-21 22:26:51 +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
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
Alexis Algoud
48d674578b
FIX line is refetch (and seems useless) unless it was modified by the hook previous calling
2016-01-19 11:54:07 +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
be4f9baac6
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4
FIX: Sql syntax error in doc_generic_task_odt
2016-01-16 10:20:14 +01:00
arnaud
8b2541ebf9
FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules
2016-01-14 14:10:50 +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
63ebd40ceb
Fix bad var value
2016-01-14 11:22:59 +01:00
Laurent Destailleur
0f5e208127
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-13 20:43:49 +01:00
phf
d213fbae08
FIX invoice situation
2016-01-13 13:42:58 +01:00
Laurent Destailleur
9ba25be9bb
Change category for application
2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b
Fix missing default setup when module is enabled
2016-01-13 13:36:44 +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
phf
f280061a90
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
2016-01-12 11:09:47 +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
aspangaro
965a96784c
Fix: Donation some problems with french article
2016-01-10 07:35:00 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
56af0761ee
Merge pull request #4295 from aspangaro/develop-a8
...
Accountancy Add a list to select accounting account on donation admin
2016-01-09 17:46:02 +01:00
Laurent Destailleur
e5d0bc9d57
Fix permission not used
2016-01-09 00:34:15 +01:00
Benlo
4aef3d29c1
FIX 4347 : Add labels in translations and change order
2016-01-08 15:03:46 +01:00
Benlo
00b77bafbe
CLOSE #4347 Add payment label to invoices csv exports
...
For CSV export, add the possibility to export the column libelle (name of payment)
2016-01-07 14:20:54 +01:00
philippe grand
7b7f2e9fed
translations
2016-01-07 10:07:05 +01:00
Laurent Destailleur
d6c5a73264
Fix missing payment fields definition in export
2016-01-06 17:37:01 +01:00
BENKE Charlie
428b10d26b
Update doc_generic_supplier_proposal_odt.modules.php
2016-01-06 10:55:37 +01:00
BENKE Charlie
cd2e4a5e1e
Update doc_generic_proposal_odt.modules.php
2016-01-06 10:53:11 +01:00
BENKE Charlie
cbb5f522eb
Update doc_generic_task_odt.modules.php
2016-01-06 10:39:18 +01:00
BENKE Charlie
e6fd718e51
Update doc_generic_project_odt.modules.php
2016-01-06 10:38:06 +01:00
BENKE Charlie
16d43b169c
Update doc_generic_invoice_odt.modules.php
2016-01-06 10:36:34 +01:00
BENKE Charlie
743967a9b3
Update doc_generic_shipment_odt.modules.php
2016-01-06 10:35:43 +01:00
BENKE Charlie
ef597395ba
Update doc_generic_order_odt.modules.php
2016-01-06 10:34:55 +01:00
BENKE Charlie
5e9b7f07d6
Update doc_generic_odt.modules.php
2016-01-04 15:09:18 +01:00
BENKE Charlie
7d6eb270b8
Update doc_generic_proposal_odt.modules.php
2016-01-04 15:08:44 +01:00
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
aspangaro
4ae15adc69
Fix: wrong link on leave tabs in user card
2015-07-16 06:10:51 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Regis Houssin
f23afc3453
Fix: wrong path and add index.html
2015-07-13 10:07:38 +02:00
Laurent Destailleur
8690b5e70e
FIX #3173 Overlapping of shipment ref
2015-07-12 16:22:06 +02:00
Laurent Destailleur
688562a816
Fix regression: We can't yet set method __construct of DolibarrModules
...
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
2015-07-10 09:40:18 +02:00
Maxime Kohlhaas
9f9ba12802
New : option to allow credit note without related invoice
2015-07-08 14:32:57 +02:00
Marcos García de La Fuente
eff573e753
Removed duplicated code from core modules
2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
56ff0c7350
Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove
2015-07-07 13:08:12 +02:00
Laurent Destailleur
56560d9379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:49:01 +02:00
Regis Houssin
4273c4aad9
Fix: data can be just a value, not an array
2015-07-03 11:35:11 +02:00
Regis Houssin
b70dfd0d54
New: possibility to defined a tab for all entities in module descriptor
2015-07-03 11:16:24 +02:00
Regis Houssin
4fb5af7442
Fix: reset the current entity
2015-07-03 10:58:55 +02:00
Laurent Destailleur
312281f4d4
Debug askpricesupplier
...
Try to continue work on position of menu entries.
2015-07-02 22:43:51 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
c218843cdb
FIX Save of filters into export profiles failed.
2015-06-24 18:29:29 +02:00
Florian HENRY
daab394c81
add extrafields into import product
2015-06-24 12:40:56 +02:00
Laurent Destailleur
0780c84012
Fix missing payment mode into export invoice profile
2015-06-23 23:58:04 +02:00
Laurent Destailleur
040a643ee9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
phf
06962cb4e6
FIX : tool export handle the type "select" extrafields and return the value instead of id
2015-06-23 16:26:05 +02:00
Laurent Destailleur
27cc7ef2b3
Time spent
2015-06-23 10:13:08 +02:00
aspangaro
20582b9ea5
Merge remote-tracking branch 'Upstream/develop' into develop-36
2015-06-21 07:31:43 +02:00
Laurent Destailleur
2c5ef858d0
NEW Filter "active" by default on user list.
...
Fix label of permission of project module
2015-06-20 20:35:57 +02:00
aspangaro
0ff97da1ea
Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
2015-06-20 09:06:20 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Laurent Léonard
a337b6f874
Rename "duree" property of interventions to "duration"
...
This also fixes the display problem of total duration on the "soleil" document model
2015-06-11 23:18:29 +02:00
Regis Houssin
edd5c33c5b
Fix: Strict standards: Only variables should be passed by reference
...
http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference
2015-06-10 18:22:47 +02:00
aspangaro
592d124f26
Merge remote-tracking branch 'Upstream/develop' into develop-28
2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976
NEW: Add a tab document in donation card
2015-06-08 21:28:32 +02:00
Raphaël Doursenaud
143a7d7328
Use rfc6761 example.com domain instead of domain.com in examples
...
Fix #2988
2015-06-08 17:13:23 +02:00
Laurent Destailleur
8d84dd1155
Uniformize code
2015-06-06 14:34:57 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
7e3a457f85
Merge pull request #2942 from aspangaro/develop-donation
...
Fix: Donation error on admin tab & Fix: Input disabled by default
2015-06-05 15:57:35 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a1391ba8b7
Merge pull request #2959 from aspangaro/develop-patch22
...
Fix: wrong file & problem to install model
2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f
NEW A module can add its entries into cron module.
2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f
Fix: wrong file & problem to install model
2015-06-04 21:14:30 +02:00
Laurent Destailleur
4adeb8980d
NEW Add ref and label of project into export
2015-06-03 16:40:02 +02:00
aspangaro
bde91633da
Fix: input of french article is disabled by default
2015-06-03 06:01:05 +02:00
Laurent Destailleur
6e72d3c8cc
FIX Export of tags for contact and member
2015-06-01 21:34:21 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
1b681510a5
NEW Use new select2 component for juridical status, country and state
...
selection.
2015-05-31 12:25:33 +02:00
Laurent Destailleur
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
0b372a4017
Use a dedicated icon instead of generic one
2015-05-30 17:32:50 +02:00
Laurent Destailleur
7f352e5b24
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-30 15:21:56 +02:00
Laurent Destailleur
b14b1c1b12
Use dedicated picto
2015-05-30 15:21:48 +02:00
Laurent Destailleur
03c06b3cf8
Merge pull request #2916 from aspangaro/develop-patch23
...
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
Regis Houssin
c8c0f0f038
Fix: possibility to shared facnumber between entities
2015-05-29 11:31:51 +02:00
aspangaro
d3513bf2a7
Fix: lot of typo to export salaries
2015-05-28 06:41:01 +02:00
aspangaro
58893a4576
Fix: problem of rights to export salaries
2015-05-28 06:26:28 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
abb
ba68598ec7
added new trigger for supplier invoice unvalidation in Agenda
2015-05-23 15:09:44 +01:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45
Prepare to generalize usage of get_exdir
2015-05-18 21:47:44 +02:00
Florian HENRY
f29d8aed5b
Fix problem with multicompany on new feature Product propal merge PDF
...
product
2015-05-15 17:39:28 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7
Merge remote-tracking branch 'upstream/develop' into commercial-name
2015-05-15 11:17:21 +02:00
Laurent Destailleur
c33cbefad2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 11:16:29 +02:00
Laurent Destailleur
3f5215169a
Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr
...
into aspangaro-develop-ER_badge
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Laurent Destailleur
74607218ea
Fight against key tva_taux. Removed completely.
2015-05-14 15:59:09 +02:00
aspangaro
766c58724a
ER: Review & add a totalVAT in pdf
2015-05-14 08:26:41 +02:00
aspangaro
bba0349ab6
ER: traduce code
2015-05-14 07:36:48 +02:00
Laurent Destailleur
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
8e09f54a46
Minor fixes
2015-05-13 07:46:12 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Juanjo Menent
23bd8f50df
Merge pull request #2809 from atm-maxime/develop
...
New : Signature area on proposal PDF
2015-05-11 20:09:54 +02:00
Laurent Destailleur
f275145bd2
FIX We did a test on a permission to export contract when permission did
...
not exists.
2015-05-10 23:46:34 +02:00
Laurent Destailleur
a503d90982
FIX We did a test on a permission to export contract when permission did
...
not exists.
2015-05-10 23:37:04 +02:00
Maxime Kohlhaas
443badfbcf
New : Signature area on proposal PDF
2015-05-10 17:39:57 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
afc487ef9d
Fix phpcs
2015-05-07 13:28:03 +02:00
Laurent Destailleur
36ebaf7a22
Clean code
2015-05-06 23:31:03 +02:00
Maxime Kohlhaas
1cb7d284a5
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:29:58 +02:00
Maxime Kohlhaas
72c4337f4b
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Juanjo Menent
ea95a461e2
Fix: Make propal pdf "azur" compatible with the two products images
...
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +02:00
Maxime Kohlhaas
42455f771a
Missing comments
2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
b203263e91
Fix : shipment PDF was not using generation params
2015-05-06 12:16:36 +02:00
jfefe
24bf614061
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
Laurent Destailleur
f97d81701b
Add an exit to avoid to have apache hangs.
2015-05-05 13:46:28 +02:00
jfefe
3b1f6e8a5a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
2015-05-05 12:56:10 +02:00
Laurent Destailleur
467ee7b771
Fix error into export filter step
...
Conflicts:
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modContrat.class.php
htdocs/core/modules/modFournisseur.class.php
2015-05-05 12:45:38 +02:00
Laurent Destailleur
c665bfa3ee
Fix error into export filter step
2015-05-05 12:39:27 +02:00
Laurent Destailleur
a18e3c7813
Fix correct id of core modules
2015-05-04 12:02:09 +02:00
jfefe
53f480708f
Merge branch 'develop' into api_restler
2015-05-03 23:43:13 +02:00
Laurent Destailleur
8a7728f193
Merge pull request #2752 from fappels/develop-tcpdfbarcode
...
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
2015-05-03 21:19:01 +02:00
jfefe
2ea8c90fe2
Module descriptor for API module
2015-05-03 14:53:40 +02:00
Laurent Destailleur
0479bd5a59
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/modAdherent.class.php
2015-05-03 13:00:39 +02:00
Francis Appels
2b32dc4ba8
Apply correct tabulation
2015-05-03 11:51:54 +02:00
Francis Appels
cb75d0778a
Fix doc errors
2015-05-03 11:09:33 +02:00
Francis Appels
fee4c4e0e2
Fix: add newline at eof
2015-05-03 10:26:12 +02:00
Francis Appels
f9ece24f95
Fix: Member card header/footer text
2015-05-03 10:09:31 +02:00
Francis Appels
f9908c48cb
Add datamatrix en qrcode barcodes
2015-05-03 10:07:04 +02:00
Francis Appels
96dfdfeb73
New tcpdf barcode label printing class
...
New tcpdf barcode label printing class and add parameters to printsheet
for using this class.
Add parameter to modules_xxx.php functions to pass printing templete
class to use
2015-05-03 10:05:59 +02:00
Francis Appels
701c85620b
Extend sticker classes from abstract class
...
Extend member and printsheet sticker printer classes from new abstract
commonsticker generator
2015-05-03 10:00:11 +02:00
aspangaro
315e9239ac
Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2
2015-05-02 06:45:53 +02:00
aspangaro
1174c67b07
Accountancy - Add key language & prepare journal for expense report
2015-05-02 06:42:06 +02:00
Raphaël Doursenaud
31a8e38d37
Allow exporting projects without a third party
...
FIX #2729
Conflicts:
htdocs/core/modules/modProjet.class.php
2015-05-01 16:01:57 +02:00
Raphaël Doursenaud
93937fe7f3
Allow exporting projects without a third party
...
FIX #2729
2015-05-01 15:58:36 +02:00
Raphaël Doursenaud
a6b0f6cfac
Allow exporting projects without a third party
...
FIX #2729
2015-05-01 15:56:39 +02:00
Juanjo Menent
29c9686b8e
Merge pull request #2730 from GPCsolutions/dolibarr-2718
...
Export task labels
2015-04-30 21:02:17 +02:00
Juanjo Menent
91767edd05
Fixed SQL table reference for members types in export
2015-04-30 20:50:05 +02:00
Raphaël Doursenaud
afc582a369
Fixed SQL table reference for members types in export
...
FIX #2712
2015-04-30 17:20:53 +02:00
Francis Appels
f762d6d7cb
Add tcpdfbarcode
...
Add modTcpdfbarcode class
Add pdf_label class
pdf_standardlabel extends pdf_label
2015-04-30 16:41:52 +02:00
Raphaël Doursenaud
f1032baaab
Allow exporting projects without a third party
...
FIX #2729
2015-04-30 11:48:32 +02:00
Raphaël Doursenaud
2058d21da9
Export task labels
...
FIX #2718
2015-04-30 11:43:42 +02:00
Laurent Destailleur
060d8a1a38
FIX Ref/label of product on contract line was not visible, nor into
...
page, nor into PDF.
2015-04-29 19:57:01 +02:00
Laurent Destailleur
305030ae6c
Fix test to match new field names of note
2015-04-22 21:58:12 +02:00
Laurent Destailleur
807824aaad
Fix warnings
2015-04-22 21:48:59 +02:00
Laurent Destailleur
7f5377d219
Fix #2695
2015-04-22 19:25:20 +02:00
Laurent Destailleur
b57d3ddf03
Merge pull request #2695 from Ankapi/develop
...
Fixed hook "pdfgeneration" in the pdf blochet of cheque deposit
2015-04-22 19:24:40 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
David Avigni (Ankapi)
e298bd0a68
Fixed hook "pdf generation", executeHooks misnamed: replacement
...
"adterPDFCreation" with "afterPDFCreation"
2015-04-22 15:23:52 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
Laurent Destailleur
111b54d82c
Fix phpcs
2015-04-19 03:02:49 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
Laurent Destailleur
9dd73de9b0
Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Florian HENRY
62ef9743ea
Merge branch 'develop' into dev_pdfpropalmergeproductpdf
2015-04-18 19:16:33 +02:00
Laurent Destailleur
e1403b136c
Merge pull request #2639 from aternatik/stable_resource
...
New : mark resource module as stable
2015-04-18 18:48:24 +02:00
Florian HENRY
e15d4c045d
NEW : Propal merge product card PDF into azur
2015-04-18 18:44:05 +02:00
jfefe
5c4633d538
New : mark resource module as stable
2015-04-18 18:18:21 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Raphaël Doursenaud
54b8aa8a0b
Fixed typo in task export
...
Closes #2607 , #2609
2015-04-14 19:14:16 +02:00
BENKE Charlie
aa076b2af6
Update modBanque.class.php
...
added the id of bordereau for link with the cheque
2015-04-14 10:19:41 +02:00
BENKE Charlie
db02cab550
Update modBanque.class.php
...
added fk_bordereau on bank export 1 to link the 2 export
2015-04-14 01:23:42 +02:00
Laurent Destailleur
d7ef1e7da0
The supplier code was not visible on supplier pdf.
2015-04-13 14:25:27 +02:00
Laurent Destailleur
e036e7baf4
Restore correct filling of page
2015-04-12 19:37:49 +02:00
BENKE Charlie
59bff8afac
Update pdf_paiement.class.php
...
Minors bug fix (first page with bad numbering)
improvement compute of number of page
better fillment of page with line (save the tree is good for karma)
2015-04-11 12:22:42 +02:00
Laurent Destailleur
530650b857
Make module productbatch stable
2015-04-10 11:59:41 +02:00
Laurent Destailleur
fc803e7000
Fix permission lost when enabled/disabled module.
2015-04-08 17:33:38 +02:00
Scrutinizer Auto-Fixer
918ed34364
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-07 00:45:30 +00:00
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Laurent Destailleur
828dc2c9f4
Fix code standard
2015-04-06 12:22:52 +02:00
Laurent Destailleur
2ec5595277
NEW Can install an external module from admin pages, if web server has
...
permission for and if setup is ok for.
2015-04-04 00:19:03 +02:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
4241244345
Fix: class not defined
2015-04-02 17:35:07 +02:00
Laurent Destailleur
c90a86e4a4
Fix filters for exports
2015-04-02 16:58:36 +02:00
Laurent Destailleur
761409caf6
Fix sql error
2015-04-02 15:17:07 +02:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +02:00
Marcos García de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
aspangaro
c22a563422
New: Add management for accounting account in admin donation & correct bugs
2015-03-29 21:04:20 +02:00
aspangaro
4209deafd2
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-26 21:04:20 +01:00
Laurent Destailleur
1ca95acbd7
Fix pb during export of agenda events
...
Conflicts:
htdocs/exports/export.php
2015-03-26 11:23:21 +01:00
Laurent Destailleur
ce8bd7a515
Fix pb during export of agenda events
2015-03-26 11:20:39 +01:00
aspangaro
b60f1e33d6
Debug
2015-03-26 06:29:16 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
679391d337
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-25 20:59:48 +01:00
Laurent Destailleur
a32fc9efce
Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set.
...
Avoid logo to overwrap box with css.
Add help text.
2015-03-24 14:08:56 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
aspangaro
be0ab4c9b4
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-23 06:58:25 +01:00
aspangaro
414d4c6432
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-22 18:08:12 +01:00
aspangaro
feef043513
Correct
2015-03-22 15:27:05 +01:00
Laurent Destailleur
55140afde4
Merge branch 'price-global-variables' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/dynamic_price/editor.php
2015-03-22 12:45:04 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
aspangaro
9264482e25
Update works
2015-03-22 08:20:19 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
aspangaro
c4a580723d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-20 06:36:06 +01:00
aspangaro
7b6cb59f4b
Move module Don in htdocs->donations
2015-03-19 05:17:10 +01:00
Laurent Destailleur
6e251690ab
Doxygen
2015-03-17 11:23:45 +01:00
Scrutinizer Auto-Fixer
b693ed3f51
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +01:00
Marcos García de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
BENKE Charles
8f0e514f83
Update pdf_paiement.class.php
...
Add bank account on detail line (usefull when you have many bank account)
Add society name in the header (usefull when you nanage many society)
2015-03-15 10:49:16 +01:00
Ion Agorria
2c80b39937
Configuration page of dinamic prices and price global variables editor
2015-03-14 16:51:38 +01:00
Laurent Destailleur
c4ff66c5d7
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-03-14 13:46:18 +01:00
Laurent Destailleur
89b22be063
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
2015-03-14 13:44:26 +01:00
Laurent Destailleur
ca34575df4
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
2015-03-14 13:42:00 +01:00
Laurent Destailleur
5670e92842
Position of field into pdf baleine
2015-03-14 12:35:03 +01:00
aspangaro
3897e65425
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-11 05:28:59 +01:00
Laurent Destailleur
4b8fa00edb
Merge pull request #2422 from guedel/sqlite3-dev
...
Sqlite3 dev
2015-03-11 02:54:15 +01:00
Laurent Destailleur
e8732df747
Merge pull request #2441 from aspangaro/develop-ReviewER
...
FIXED: Review Expense Report
2015-03-11 02:14:13 +01:00
Laurent Destailleur
9a3e5d7fc5
Fix code unreachable
2015-03-10 13:58:26 +01:00
Laurent Destailleur
84695845bb
Some fixes into translation and permissions
2015-03-09 21:20:56 +01:00
Laurent Destailleur
88a29b7c9c
Add an advance permission to check/uncheck reception
2015-03-09 20:26:56 +01:00
Laurent Destailleur
bd81dec1a3
Fix missing translation
2015-03-09 19:28:38 +01:00
Laurent Destailleur
bd6f13e6ed
Can export extra fields of lines.
2015-03-09 19:13:19 +01:00
aspangaro
69dc3cdd61
Correct fk_statut & work en list
2015-03-08 08:21:49 +01:00
aspangaro
df305bd316
Deactivate conflict with Mod Deplacement - Need to access on old data
2015-03-07 15:01:30 +01:00
Scrutinizer Auto-Fixer
27e99793a3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-06 02:10:01 +00:00
Laurent Destailleur
e67c328cef
Merge pull request #2429 from defrance69/patch-50
...
Update modFacture.class.php
2015-03-06 02:05:00 +01:00
aspangaro
11704e0807
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-05 20:24:53 +01:00
Guillaume de Lestanville
dd2594692e
Updating compatibility with Sqlite3
...
- Replace USING syntax by IN SELECT syntax
- Fix error on database creation
- Removing test on username parameter when installing.
2015-03-05 17:35:37 +01:00
Laurent Destailleur
d119397129
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-05 11:38:16 +01:00
BENKE Charles
703a6c1b54
Update modFacture.class.php
...
add fk_bank on bill export, this fields is needed to link with external accounting
2015-03-05 00:38:54 +01:00
Laurent Destailleur
ec4c1a493f
Merge pull request #2424 from FHenry/develop
...
NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export
2015-03-04 23:14:05 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
fmarcet
1a02f6aa80
Fix: Masks works with thirdparty type
2015-03-04 18:18:55 +01:00
Laurent Destailleur
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Florian HENRY
14847e2b5d
Better column order
2015-03-04 10:08:13 +01:00
Florian HENRY
fdbb0ace8b
NEW : Add company information into category contact export
2015-03-04 10:00:37 +01:00
Laurent Destailleur
2c3a412c3a
Fix export extrafield on supplier orders
2015-03-04 02:08:51 +01:00
aspangaro
c119ce382e
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-02 21:05:38 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
3475433eaf
Fix: the bank information were visible into pdf but were not using
...
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
guillaume
207fa671b1
Mise en place de l'initialisation de la base avec PDO SQlite
2015-02-25 09:04:11 +01:00
aspangaro
4803a1fb89
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-25 06:59:27 +01:00
Laurent Destailleur
3fb3e4af4e
Merge pull request #2386 from lrq3000/3.7
...
Fix lastrowid-*table* option when defining imports
2015-02-24 17:16:17 +01:00
Laurent Destailleur
fec9e222b1
Merge pull request #2391 from aspangaro/develop-patch10
...
FIXED: Module Expense Report - Correct init
2015-02-24 17:11:32 +01:00
Laurent Destailleur
fd9fc191fc
Merge pull request #2388 from aspangaro/develop-patch8
...
Module Expense Report: reactivate conflict with modDeplacement
2015-02-24 17:06:43 +01:00
Laurent Destailleur
f23234356e
Merge pull request #2387 from aspangaro/develop-patch7
...
Move new module Expense Report in hrm
2015-02-24 17:03:12 +01:00
Laurent Destailleur
714b3d277c
Merge pull request #2394 from aspangaro/develop-patch12
...
FIXED: Update licence to GPLv3
2015-02-24 16:56:01 +01:00
Laurent Destailleur
562348eb34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1
Fix missing fields into import of thirdparties.
...
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
2015-02-24 15:40:50 +01:00
Laurent Destailleur
44c392ca23
Fix missing profid5 and 6
2015-02-24 13:35:37 +01:00
aspangaro
c1069eea47
FIXED: Update licence to GPLv3
2015-02-23 22:04:01 +01:00
aspangaro
be3fd5529a
FIXED: Module Expense Report - Correct init
2015-02-23 20:31:44 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
11a0624e39
[CORE] FIX Travis phpcs (#incoterm).
2015-02-23 11:19:00 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
c459794999
[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).
2015-02-23 10:36:44 +01:00
aspangaro
d0cc072a58
Module Expense Report: reactivate conflictwith modDeplacement
2015-02-23 06:49:11 +01:00
aspangaro
95f211775b
Move new module Expense Report in hrm
2015-02-23 06:45:03 +01:00
Laurent Destailleur
1bba3a01e2
phpcs
2015-02-22 23:41:34 +01:00
Stephen L
fe62e038ca
Fix lastrowid-*table* option when defining imports (fix extrafields fk_object value)
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2015-02-22 14:34:51 +01:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
Laurent Destailleur
6d1324b463
Work on expense report module
2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Laurent Destailleur
5dffe4b440
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0
Work on new module expense report
2015-02-21 12:57:17 +01:00
Laurent Destailleur
9ac38dee45
Merge pull request #2367 from marcosgdf/bug-1652
...
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
2015-02-20 23:27:53 +01:00
Laurent Destailleur
a6e2e5ffcb
Merge pull request #2360 from delcroip/patch-1
...
export on user
2015-02-19 00:14:04 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
bd9c168e3c
Doxygen
2015-02-18 23:42:39 +01:00
Laurent Destailleur
06c90e67bb
Merge pull request #2339 from KreizIT/fix_1829
...
FIXED : #1829 POS not compatible with batch products
2015-02-18 22:38:19 +01:00
Laurent Destailleur
b6947dbe2c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614
Miscelaneous debug on barcode features.
2015-02-18 21:01:17 +01:00
Laurent Destailleur
ad67fe50a3
Correct management when delivery date is universal time format.
2015-02-17 17:21:41 +01:00
Laurent Destailleur
685b8d722d
Fix: Bad hook name
2015-02-17 16:46:37 +01:00
Laurent Destailleur
bc88917b81
phpcs
2015-02-17 10:18:01 +01:00
Laurent Destailleur
a64cd69639
phpcs
2015-02-17 09:56:19 +01:00
Marcos García de La Fuente
529d4447ef
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
2015-02-17 00:04:31 +01:00
Laurent Destailleur
b00de9707a
Work on expensereport module
2015-02-15 19:13:16 +01:00
delcroix Patrick
8a7d4ea71d
export on user
...
to be able to choose the user for reporting purpose (no column named Name in the user table)
2015-02-15 17:01:47 +01:00
Laurent Destailleur
3b09dc53cd
Fix regression on total visible on invoice since situation invoice.
2015-02-14 20:32:11 +01:00
Laurent Destailleur
448655ea45
First work on a new module for expense report matching dolibarr
...
standard to replace current one.
2015-02-14 18:39:45 +01:00
Laurent Destailleur
bd4b401281
New: Introduce "_deprecated" keyword into module version when module has
...
been superseed by another one.
2015-02-14 15:10:06 +01:00
Laurent Destailleur
6adfc6f6f4
Work on batch module. Add batch, eatby and sellby into movement table.
...
Clean language files for direct print module.
2015-02-12 15:23:31 +01:00
Laurent Destailleur
122a7c199c
Prepare a module for mail document generation.
2015-02-12 00:10:15 +01:00
Laurent Destailleur
8a6d3aa633
Clean module print system
2015-02-11 14:22:44 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
phf
791bd7e9d9
[CORE] retrait la page de configuration et des tests sur la variable d'activation du module qui est inutile (#incoterm).
2015-02-10 11:45:23 +01:00
KreizIT
2483d96b33
FIXED : #1829 POS not compatible with batch products
2015-02-09 17:19:20 +01:00
phf
c7e1528594
[CORE] initialisation de l'intégration du module incoterm au corp de dolibarr (#incoterm).
2015-02-09 15:53:19 +01:00
phf
ffecdc13ff
[CORE] déplacement de la création des tables du module dans le script de migration (#new_ask_price).
2015-02-09 10:38:48 +01:00
phf
a1d2f426b8
[CORE] correction mineurs pour travis (#new_ask_price).
2015-02-09 10:17:28 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Laurent Destailleur
1d1b3da182
Fix: the syslog handler for chromphp an fiefoxphp was not visible when
...
they should not.
2015-02-07 19:30:28 +01:00
Laurent Destailleur
64963ef9bd
Fix: the syslog handler for chromphp an fiefoxphp was not visible when
...
they should not.
2015-02-07 19:12:22 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
phf
bf643c26da
[CORE] FIX : des noms des hooks
...
+ correction nom de variable (#new_ask_price).
2015-02-06 09:50:27 +01:00
phf
bcbf29d9a5
[CORE] assainissement du code + traductions FR vers EN (#new_ask_price).
2015-02-04 15:39:57 +01:00
phf
8bfb5839ca
[CORE] modification de l'affichage (#new_ask_price).
2015-02-03 16:53:09 +01:00
phf
7ae003fa1a
[CORE] modification de l'affichage (#new_ask_price).
2015-02-03 16:52:49 +01:00
Laurent Destailleur
0b01fa8eb8
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-02-03 13:45:10 +01:00
Laurent Destailleur
f865534b4c
Fix some pdf differences
2015-02-03 13:43:37 +01:00
Laurent Destailleur
96215ccea5
Fix bad operator for and
2015-02-03 13:05:28 +01:00
aspangaro
14a078c9a7
FIXED Accountancy clean code
2015-02-03 06:39:44 +01:00
Laurent Destailleur
7b209fa0be
New: Add hidden option PDF_SHOW_PROJECT to show project ref onto
...
supplier orders and invoices.
2015-02-02 18:36:49 +01:00
phf
a3c29f2e9c
[CORE] Avancement du fonctionnement du module, correction bug et épuration de l'affichage (#new_ask_price).
2015-02-02 15:41:14 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
phf
85a4df4ce2
[CORE] maj du pdf, champs PU HT et Total HT vide (#new_ask_price).
2015-02-02 10:06:36 +01:00
Laurent Destailleur
963b9e8583
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 19:37:25 +01:00
Laurent Destailleur
d32f52cc50
Fix date of delivery, and avoid duplicate tracking number.
2015-01-31 16:23:23 +01:00
Laurent Destailleur
770ddb6b0f
Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-task-1793
Conflicts:
ChangeLog
htdocs/margin/lib/margins.lib.php
2015-01-31 14:29:15 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
phf
aba3ec0612
[CORE] modification de l'affiche du PDF (#new_ask_price).
2015-01-29 12:26:50 +01:00
phf
2f8ceea587
[CORE] renomage de variables pour le module + modification de traductions (#new_ask_price).
2015-01-29 12:12:22 +01:00
phf
3743745cd8
[CORE] maj mineur (#new_ask_price).
2015-01-29 10:44:23 +01:00
phf
a98ce01807
[CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price).
2015-01-28 17:27:26 +01:00
phf
c5398f61f9
[CORE] Modif de trad et renomage pour le module askpricesupplier (#new_ask_price).
2015-01-28 15:37:52 +01:00
phf
3644f4c84c
[CORE] renomage de masse (#new_ask_price).
2015-01-28 14:48:59 +01:00
phf
49fa0056c8
[CORE] Avancement des replace (#new_ask_price).
2015-01-27 17:43:07 +01:00
phf
aaacca9b13
[CORE] première partie des grosses modifications (#new_ask_price).
2015-01-27 16:53:27 +01:00
Maxime Kohlhaas
11dd32a8fd
FIXED Import module was not working with multi-company and importing everything in entity 1
2015-01-26 23:37:25 +01:00
phf
6fee87ca56
[CORE] ajout en commentaire de la requete sql de creation de table (#new_ask_price).
2015-01-26 17:35:37 +01:00
phf
60be0193b0
[CORE] Initialisation global du module askpricesupplier (#new_ask_price).
2015-01-26 17:21:35 +01:00
Laurent Destailleur
da9f13bca9
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
b926a77325
Merge pull request #2280 from aspangaro/3.7-Accountancy
...
FIXED Accounting module - Align integrate core version & module version 3.6
2015-01-25 17:53:17 +01:00
aspangaro
ae11ab12f6
FIXED Accounting module - Align core & module 3.6
2015-01-25 06:54:17 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
Laurent Destailleur
568d5cb5ba
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
Conflicts:
htdocs/langs/en_US/agenda.lang
2015-01-23 18:47:47 +01:00
Laurent Destailleur
083cf06908
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
2015-01-23 18:33:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
c667f8734a
[ task #1793 ] Create new permission to restrict commercial agent margin to logged user
2015-01-18 16:42:11 +01:00
Laurent Destailleur
34fe87536b
Merge pull request #2137 from frederic34/printipp
...
Printing System which may accept modules
2015-01-18 13:09:41 +01:00
Laurent Destailleur
b1f889e1d1
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-01-18 12:46:23 +01:00
Marcos García de La Fuente
71e5cf07c6
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
2015-01-18 03:12:46 +01:00
Laurent Destailleur
1664b89cef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 19:26:19 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
41890d0a0b
Fixed: Translation of module name and desc was not used for external
...
modules.
2015-01-16 14:38:00 +01:00
Marcos García de La Fuente
4da52cf733
Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date
2015-01-13 11:11:37 +01:00
Laurent Destailleur
c441aa89db
Fixed: Avoid warning
2015-01-10 18:19:44 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
df1f931ab8
Fixed: [ bug #1767 ] Contract document is not generated properly
2014-12-28 18:10:41 +01:00
frederic34
9c2c338dc0
Typo on variable
2014-12-28 14:21:54 +01:00
frederic34
e937039596
Merge remote branch 'upstream/develop' into printipp
2014-12-28 11:59:58 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
90d275bd20
Fix comment
2014-12-22 02:53:55 +01:00
frederic34
3bf63ed0a9
Merge remote branch 'upstream/develop' into printipp
2014-12-21 14:59:37 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
ef5035b349
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/liste.php
2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
Christophe Battarel
c9f69279c7
FIX: pagebreak on fichinter like in other documents
2014-12-16 16:21:31 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
frederic34
df28ce77c0
Some progress on Printing
2014-12-11 21:58:56 +01:00
frederic34
608f4a7d7d
Some correct html
2014-12-09 23:37:04 +01:00
Laurent Destailleur
6a70af2b67
Fixed: bug into produc batch management
2014-12-09 14:03:10 +01:00
frederic34
6b4d7b973b
Some changes
2014-12-08 23:30:17 +01:00
frederic34
16d860b3f7
Lang Correction
2014-12-08 22:17:28 +01:00
frederic34
715d0f18db
Lang correction
2014-12-08 21:52:53 +01:00
frederic34
9bb1999dc2
Some correct
2014-12-08 21:07:24 +01:00
frederic34
295fe115ab
Merge remote branch 'upstream/develop' into printipp
2014-12-08 20:33:50 +01:00
frederic34
be60c13de6
WIP Printing System
2014-12-08 20:33:26 +01:00
frederic34
5cce8c45e3
WIP PrintIPP
2014-12-05 18:23:54 +01:00
Laurent Destailleur
a9338a0f9f
Fix: Maxi debug of module productbatch.
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a
Fix: Maxi debug of module productbatch.
2014-12-05 16:01:01 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
Laurent Destailleur
1653384415
Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices
2014-12-03 13:14:35 +01:00
Laurent Destailleur
f884f16564
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/boxes.php
htdocs/comm/action/card.php
htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Laurent Destailleur
cf646b914d
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-11-30 18:57:52 +01:00
Laurent Destailleur
ef4bdcdb2a
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-30 15:43:04 +01:00
Ion Agorria
c6e4ff3c41
Renamed module desc file
2014-11-30 15:41:49 +01:00
Laurent Destailleur
e395fd8096
Fix CRLF
2014-11-30 15:24:39 +01:00
Ion Agorria
c36f94a9a3
Fixed dinamic typo to dynamic
2014-11-30 15:14:25 +01:00
Laurent Destailleur
7843ed41f3
Fixed: Bad permission
2014-11-29 20:50:05 +01:00
Laurent Destailleur
06df952e57
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-11-29 12:40:20 +01:00
Laurent Destailleur
0a7255ccc1
Fixed: Module for target emailing must not be visible when modules is
...
disabled.
2014-11-29 12:38:36 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Marcos García de La Fuente
1c16a2e621
Fixed [ bug #1642 ]: add a free line in contract
2014-11-28 01:15:45 +01:00
Laurent Destailleur
44b81ad29c
Merge pull request #2074 from marcosgdf/bug-1642
...
Fixed [ bug #1642 ]: add a free line in contract
2014-11-28 01:14:23 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Francis Appels
18406fc550
Fix: Show sender Country on PDF docs
...
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Marcos García de La Fuente
9f73277ef2
Fixed [ bug #1642 ]: add a free line in contract
2014-11-23 13:14:54 +01:00
aspangaro
31b90cf383
Add 1st version of calculator but need work
2014-11-17 06:38:06 +01:00
aspangaro
840dfd780d
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-07 21:28:39 +01:00
Laurent Destailleur
b601afc92b
Merge pull request #1994 from aspangaro/develop-patch
...
Update module accounting
2014-11-05 17:40:51 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
f7e71d8848
Fix: checkstyle
2014-11-05 16:23:10 +01:00
aspangaro
cbfa90abca
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 20:57:05 +01:00
Laurent Destailleur
606a3f9917
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-11-04 17:54:09 +01:00
Laurent Destailleur
c41e908dba
Merge pull request #2000 from Devensys/Develop-MajPasswordPattern
...
New modGeneratePass with personal conf
2014-11-04 17:37:25 +01:00
Andrelec1
796f2409a1
Add verif and correction lang
2014-11-04 11:38:16 +01:00
aspangaro
25433120e6
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 06:16:03 +01:00
Andrelec1
5074feacd6
Add option and create new class
2014-11-03 17:57:55 +01:00
Laurent Destailleur
1f4f2291f6
Start module with status experimental
2014-11-02 21:18:16 +01:00
Laurent Destailleur
a1a10edc30
Merge pull request #1987 from IonAgorria/soap-client-order
...
Added SOAP client for creating a client order in remote webservice
2014-11-01 21:14:19 +01:00
Maxime Kohlhaas
ccddf0d1be
Fix : actioncomme report was not filtering by entity...
2014-10-31 16:56:14 +01:00
aspangaro
e43de8b815
Update module accounting
2014-10-31 07:37:59 +01:00
Ion Agorria
557cbaf3d7
Added module descriptor and activation checks
...
Corrected 3 missing $error_occurred flags
2014-10-31 04:59:57 +01:00
Laurent Destailleur
3ffd4432df
New: Add permissions to read all trips and expenses.
2014-10-30 11:43:57 +01:00
Laurent Destailleur
0abeea059e
Uniformize and clean boxes behaviour and translation.
2014-10-27 21:48:28 +01:00
Laurent Destailleur
5d57c59241
Fix: Bad parameter of get_substitutionarray_other
2014-10-15 18:16:41 +02:00
Laurent Destailleur
f498921715
Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-droposcommerce
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/vi_VN/admin.lang
htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
Laurent Destailleur
8df8fb2fe0
Qual: Removed a lot of duplicate code
...
New: extrafields for projects and tasks are exported to ODT documents.
2014-10-12 16:19:00 +02:00
Laurent Destailleur
591b40e674
Some fix with export definition. Works now with pgql too.
2014-10-12 01:59:21 +02:00
Laurent Destailleur
a69fb2126c
Merge pull request #1861 from defrance69/patch-20
...
Update modContrat.class.php
2014-10-12 01:40:00 +02:00
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +02:00
Laurent Destailleur
5c5f725a34
Fix scrutinizer
2014-10-05 01:22:17 +02:00
Laurent Destailleur
11d1be882c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/list.php
2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
c1db82a791
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-04 08:10:12 +02:00
Laurent Destailleur
e70aebf2c7
Merge pull request #1937 from fappels/develop
...
Expedition lines from same orderline merged.
2014-10-04 00:58:19 +02:00
Laurent Destailleur
d9f898ab8c
Merge pull request #1916 from FHenry/develop
...
Add feature to order to invoice on supplier part
2014-10-04 00:31:11 +02:00
Francis Appels
bcc5bebd77
Fix deliveryorder qty and remainingqty positions
2014-10-03 12:28:42 +02:00
Laurent Destailleur
5ac63ec534
Solve fixme.
2014-10-03 02:00:50 +02:00
aspangaro
5fc82fdcd8
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-02 19:58:09 +02:00
Regis Houssin
1541be8790
FIXME $key is not defined (strict mode)
2014-10-02 08:40:51 +02:00
aspangaro
f70e8b766f
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-09-29 20:40:53 +02:00
Laurent Destailleur
e35135d5b1
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
...
develop
Conflicts:
htdocs/compta/ventilation/card.php
htdocs/compta/ventilation/fournisseur/card.php
htdocs/compta/ventilation/fournisseur/list.php
htdocs/compta/ventilation/list.php
htdocs/core/menus/init_menu_auguria.sql
2014-09-29 16:31:35 +02:00
Florian HENRY
46f673fb5f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fourn/card.php
2014-09-29 16:01:49 +02:00
Raphaël Doursenaud
f01e76f686
Removed unmaintaned OScommerce module
2014-09-29 15:22:48 +02:00
Regis Houssin
f1f4fc18e9
Fix: use "doc" instead "pdf" dir and uniformize code
2014-09-29 11:08:50 +02:00
Florian HENRY
ce145cc056
Add cache excel export on harddrive with
...
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
2014-09-29 10:16:48 +02:00
aspangaro
250b57ca0a
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-28 14:00:26 +02:00
Laurent Destailleur
4244979f4f
Fix: doxygen
...
Fix: td balance
2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Regis Houssin
64b757ed81
Fix: add generic doc and use doc dir instead pdf
2014-09-25 12:44:57 +02:00
aspangaro
a58025c601
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-23 21:24:29 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
08d4195504
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
2014-09-22 23:34:56 +02:00
Laurent Destailleur
469ff4320a
Uniformize export profiles.
2014-09-22 21:46:46 +02:00
Marcos García de La Fuente
9244ef23af
Removed 2nd argument of muscadet and canelle model __construct function
2014-09-22 00:08:21 +02:00
Marcos García de La Fuente
ca9e33e809
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf
2014-09-21 18:00:56 +02:00
aspangaro
08b9e05425
New Module : Manage Financial Loan
2014-09-21 17:42:38 +02:00
aspangaro
ab9226aab6
Delete elements have a link with old module ventilation - Replace today by module Accounting Expert
2014-09-19 05:55:54 +02:00
Raphaël Doursenaud
c20f5b186e
Qual: Updated code documentation
2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
f68cb3bfcb
FIX: Variable declared boolean
2014-09-19 03:05:21 +02:00
Raphaël Doursenaud
afcebea440
FIX: Missing global declaration
2014-09-19 03:05:21 +02:00
Raphaël Doursenaud
131997eeb8
FIX: Removed undeclared variables
2014-09-19 03:05:21 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
dfa071e093
Fix: Are description too large
2014-09-18 01:43:50 +02:00
Laurent Destailleur
47d423aae4
Fix: Minor fix into intervention card
2014-09-18 00:21:25 +02:00
Laurent Destailleur
d976a5575b
New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto
...
PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
2014-09-17 14:36:04 +02:00
Marcos García de La Fuente
e71dc6bc32
Created a method generateDocument for several classes
...
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
2014-09-16 12:30:37 +02:00
Laurent Destailleur
0d6d064e7e
New: PDF event report show project and status of event
...
Fix: Can edit description of intervention
New: Show status of object on refere page.
2014-09-15 12:48:24 +02:00
aspangaro
4c52a6ee6f
Add admin page into salaries to manage accountancy
2014-09-10 04:53:18 +02:00
aspangaro
8f818529a6
Remove right "accounting->access" & debug menu
2014-09-09 21:19:15 +02:00
Laurent Destailleur
9e2a0cb671
Fix: debug of accountancy module
2014-09-09 09:46:57 +02:00
Laurent Destailleur
789427b75d
Upgrade phpexcel lib to 1.7.8
2014-09-07 12:12:30 +02:00
Laurent Destailleur
60c633fd8b
Qual: Generalize hook afterPDFCreation.
...
New: Add hook beforePDFCreation
2014-09-04 23:24:19 +02:00
Laurent Destailleur
adc96cc826
Merge pull request #1853 from aspangaro/develop-accounting
...
Integration of module Accounting Expert
2014-09-02 19:14:21 +02:00
BENKE Charles
05ed96f7fa
Update modContrat.class.php
...
add export contract/service feature
2014-09-02 10:45:53 +02:00
Laurent Destailleur
f245f43a3f
Doxygen
2014-08-31 23:18:09 +02:00
Laurent Destailleur
f2affade35
Doxygen
2014-08-31 23:06:58 +02:00
aspangaro
07377e7156
Merge branch 'Upstream/develop'
2014-08-30 04:42:36 +02:00
Laurent Destailleur
47339d0e62
Fix: Missing field tobuy into service export.
...
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:26:27 +02:00
Laurent Destailleur
5dc35ec137
Fix: Missing field tobuy into service export.
...
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:25:54 +02:00
aspangaro
bc686a7995
Test Correct travis
2014-08-29 06:43:05 +02:00
aspangaro
bb7aa9f29c
Merge branch 'Upstream/develop'
2014-08-29 06:33:00 +02:00
Laurent Destailleur
711e7e6fc6
Fix: phpunit test
...
Fix: debian readme to upgrade tcpdf lib.
2014-08-28 16:59:10 +02:00
Laurent Destailleur
013023204f
Merge pull request #1841 from GPCsolutions/modules
...
Modules classes documentation enhancements
2014-08-28 11:58:13 +02:00
aspangaro
6f8234dd60
Update Eldy menu
2014-08-28 07:13:33 +02:00
aspangaro
add4528e6c
Update perms
2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3
Update Accounting Expert integration
2014-08-28 06:30:01 +02:00
aspangaro
71265558d2
Integrate module Accounting Expert
2014-08-27 07:03:42 +02:00
Laurent Destailleur
7cb283d0ea
Prepare code to be able to choose what to show into footer
2014-08-25 19:16:37 +02:00
Laurent Destailleur
e3fede595f
Removed all triggers _BUILDOC. Building a document is not a business
...
status change but a technical action. So hooks must be used instead.
Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch
Conflicts:
htdocs/core/modules/project/modules_project.php
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
2014-08-22 00:01:53 +02:00
Laurent Destailleur
04b611f758
Merge pull request #1820 from aspangaro/develop-trad1
...
Qual: Renamed table llx_c_civilite into llx_c_civility
2014-08-21 23:25:49 +02:00
Laurent Destailleur
cb3cb1f734
Merge pull request #1837 from GPCsolutions/civility_id
...
Fix: module still using deprecated civilite_id
2014-08-21 23:21:21 +02:00
Laurent Destailleur
061a3384fc
Merge pull request #1836 from GPCsolutions/dictionaries
...
Fix: module still using deprecated dictionnaries
2014-08-21 23:21:08 +02:00
Laurent Destailleur
c799f0f10f
Uniformize code:
...
New: Call to hook after generation is also done into odt.
Fix: Missing hook before save.
2014-08-21 15:02:18 +02:00
Raphaël Doursenaud
c3b30893fc
Enhanced modules parent class methods documentation
2014-08-21 12:17:13 +02:00
Raphaël Doursenaud
29ca4b7a0a
Enhanced modules parent class properties documentation
2014-08-21 12:15:15 +02:00
Raphaël Doursenaud
9f02bc78a7
Fix: module still using deprecated civilite_id
2014-08-20 10:54:35 +02:00
Raphaël Doursenaud
820ae82088
Fix: module still using deprecated dictionnaries
2014-08-20 10:46:09 +02:00
aspangaro
0f7e09d01f
Merge branch 'Upstream/develop'
2014-08-20 07:54:33 +02:00
Laurent Destailleur
a26a7cedf8
Qual: Uniformize code. Trigger PROJECT_BUILDDOC is removed because
...
building a doc is not a business event. For technical action after
creation of a pdf, hook "afterPDFCreation" must be used instead.
2014-08-19 14:51:10 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Regis Houssin
68aca6f2bb
Fix: project builddoc trigger is used now
2014-08-18 08:40:35 +02:00
Regis Houssin
967991f31a
Fix: project builddoc trigger is used now
2014-08-18 08:36:58 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Florian HENRY
3c96063165
fix travis
2014-08-12 18:38:27 +02:00
Florian HENRY
ca05345a60
Fix Travis
2014-08-12 18:20:36 +02:00
Florian HENRY
db7478098a
Add a real free numbering module for contract
2014-08-12 13:26:06 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
f7c31d651c
Correct
2014-08-11 20:34:07 +02:00
aspangaro
e3ced8487a
Correct
2014-08-11 20:33:13 +02:00
aspangaro
f2b9b8b1bb
Correct
2014-08-11 20:06:10 +02:00
aspangaro
671f8e0be5
Correct
2014-08-11 14:03:30 +02:00
aspangaro
7d433f9845
Correct
2014-08-11 13:50:16 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Laurent Destailleur
4e8ec8e598
Revert "Add Reduction value in pdf"
...
This reverts commit 0b5707c1cf
2014-08-04 18:36:18 +02:00
Laurent Destailleur
8d867dde69
Merge pull request #1797 from Devensys/Develop-AddValueReduction
...
Add Reduction value in pdf
2014-08-04 09:01:45 +02:00
Laurent Destailleur
be76fd93fd
New: Add user of creation and validation on invoice export
2014-08-01 22:24:25 +02:00
Andrelec1
0b5707c1cf
Add Reduction value in pdf
...
Add value of %reduction in pdf
2014-08-01 14:49:42 +02:00
Laurent Destailleur
852b78f79f
Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for
...
constants into database driver classes.
2014-08-01 00:53:29 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
355ec7fd27
Fix: Avoid pgsql error of duplicate record making rollback.
2014-07-27 23:52:42 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
adb70ecf24
Fix: [ bug #1528 ] Leopard Services numeration module description is not
...
translated.
2014-07-26 17:40:07 +02:00
Marcos García de La Fuente
097e8d33a2
Removed PHP 5.3 comparison in ImportCsv
2014-07-22 04:16:32 +02:00
Laurent Destailleur
bf926cd791
Merge pull request #1756 from marcosgdf/messages
...
Migrated old message notifications to the """new""" system
2014-07-20 04:57:09 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
Laurent Destailleur
04a20d2008
- New: Enable feature developed for 3.6 we forgot to enabled: Adding
...
prefix on uploaded file names.
- New: No more dependency between contract and service module.
2014-07-19 22:05:35 +02:00
Laurent Destailleur
3a625ce6bf
Merge pull request #1741 from marcosgdf/url-not-available
...
Removed index.php and replaced them with blank index.html as it is more appropiate
2014-07-14 23:20:32 +02:00
Juanjo Menent
9410b18473
Fix: Import ProfId1 to siren and ProfId2 to siret
2014-07-14 19:43:48 +02:00
Juanjo Menent
f8b5bac05c
Fix: Import ProfId1 to siren and ProfId2 to siret
2014-07-14 19:40:18 +02:00
Juanjo Menent
3930c8829e
Fix: Import ProfId1 to siren and ProfId2 to siret
2014-07-14 19:38:00 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Laurent Destailleur
e5d5a25433
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
2014-07-05 11:54:02 +02:00
Laurent Destailleur
faa5eba203
Fix: Substitution for external module at wrong place.
2014-07-04 18:43:37 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Juanjo Menent
3679a4ba90
[ task #1063 ] Allow edit localtaxes rate for thirds. Works documents
...
pdf
2014-07-04 13:11:51 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Maxime Kohlhaas
7d16f62a9d
New : add remaining to ship on delivery PDF
2014-06-28 22:48:20 +02:00
Laurent Destailleur
4cd3a4f4aa
Fix: bad indice
2014-06-27 01:34:27 +02:00
Laurent Destailleur
f25bb79d80
Merge pull request #1672 from defrance69/patch-19
...
Add project and task boxes
2014-06-26 22:03:38 +02:00
Laurent Destailleur
534e574379
Merge pull request #1668 from aspangaro/develop-dons
...
Move donation receipt to french model cerfa 11580*03
2014-06-26 22:03:13 +02:00
Laurent Destailleur
656dd94011
Merge pull request #1657 from mkdgs/patch-1
...
Add customers/supplier status fo contact export
2014-06-26 21:58:23 +02:00
Laurent Destailleur
79dec7ad90
Merge pull request #1641 from defrance69/patch-17
...
Patch 17
2014-06-26 21:43:45 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
BENKE Charles
fa75ef3b57
made change on all the modules_element definition
2014-06-21 00:35:11 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
fcb00b2024
Fix: [ bug #1425 ]
2014-06-20 13:38:44 +02:00
Laurent Destailleur
51eb761b02
Merge pull request #1669 from aspangaro/develop-patch1
...
Correction on 3.6beta
2014-06-20 13:12:39 +02:00
Laurent Destailleur
8ce8bf47ee
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
Conflicts:
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
2014-06-20 12:41:23 +02:00
BENKE Charles
66dc82621d
Update modProjet.class.php
...
add boxe definition on projet module
2014-06-18 21:37:56 +02:00
Florian HENRY
df9f153142
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-06-17 12:01:45 +02:00
aspangaro
e469755d29
Divers
2014-06-16 06:17:46 +02:00
aspangaro
f4efd3b2e8
Move donation receipt to french model cerfa 11580*03
2014-06-15 22:18:19 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Florian HENRY
40a5d20cc8
Do not reset index on product import !!!
2014-06-12 16:46:20 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Florian HENRY
80facefa23
Fix [ bug #1454 ] Mention de bas de page erroné
2014-06-12 09:13:51 +02:00
Mickael Desgranges
57b4cb08b7
Update modSociete.class.php
2014-06-11 13:28:31 +02:00
Mickael Desgranges
81e715f34c
Update modSociete.class.php
2014-06-11 12:26:54 +02:00
Mickael Desgranges
84f1b8c02b
Add customers/supplier status fo contact export
...
When you export a contact list it's usefull to know if your contact is a prospect, client or supplier
2014-06-11 12:22:24 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
BENKE Charles
f806b4373a
Update modules_commande.php
...
don't display specific version
2014-06-06 15:30:33 +02:00
BENKE Charles
37c908aa99
Update modules_propale.php
...
don't display specific number of version
2014-06-06 15:29:45 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Florian HENRY
ebe49b0525
Same bug, missing select column use in result
2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158
Fix warining message during societe activation
2014-06-05 10:53:00 +02:00
Marcos García de La Fuente
4c11e37203
Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8
Salaries :: Missing key language & typo
2014-06-03 06:45:37 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Florian HENRY
d304c7785e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/pomme.modules.php
2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711
Better target emailing status mangement
2014-05-29 14:26:27 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7
Fix: CRLF
2014-05-26 12:32:33 +02:00
Laurent Destailleur
4b9d1b901b
Fix: [ bug #1401 ] Problème avec la génération des codes barres
2014-05-25 17:14:33 +02:00
Laurent Destailleur
07bc933110
Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1405
Conflicts:
ChangeLog
2014-05-23 20:21:41 +02:00
Laurent Destailleur
2771c506e9
Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1407
Conflicts:
ChangeLog
2014-05-23 20:17:41 +02:00
Marcos García de La Fuente
fa733c8ba4
Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
2014-05-23 11:42:14 +02:00
Marcos García de La Fuente
9cc74c36d2
Missing copyright info
2014-05-23 02:45:15 +02:00
Marcos García de La Fuente
77c09d887a
Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes
2014-05-23 02:44:02 +02:00
Laurent Destailleur
3f96632e02
Fix: CRLF
2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b
Fix: CRLF
2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f
Fix: When number reach 9999 with default numbering module, next number
...
will be 10000 instead of 0000 and error.
2014-05-21 19:44:53 +02:00
Laurent Destailleur
ff46adf284
Merge pull request #1607 from GPCsolutions/3.6b-review
...
3.6b review
2014-05-19 16:07:49 +02:00
Laurent Destailleur
e09cc127fd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
c83a0309b1
Barcode: fixed wrong menu
2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
13cb2e478f
Contracts module configuration: missing translation string
2014-05-19 14:37:30 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
00dd7db75e
Fix: Miscellaneous fixes into emailing target selectors (missing field
...
name, missing translation, sql syntax error, missing fiels other)
2014-05-17 19:43:22 +02:00
Laurent Destailleur
eec5d6d313
Fix: Error management of mass email feature
2014-05-17 19:02:47 +02:00
Laurent Destailleur
f7d1e93136
Move module to status development
2014-05-14 12:27:09 +02:00
Laurent Destailleur
0027dc30f5
Fix: Modules into core should never, by definition, activate hooks
...
(hooks are architecture solution for external module)
2014-05-14 12:14:18 +02:00
Laurent Destailleur
757d92a318
Merge pull request #1589 from aternatik/resource_core
...
Core integration of resource module
2014-05-14 11:25:25 +02:00
Laurent Destailleur
5f0c4dbe48
Fix: TCPDF error file not found in member card generation
2014-05-12 10:07:57 +02:00
Laurent Destailleur
6b1bdf9913
Merge pull request #1587 from aternatik/odt_thirdpartycontact
...
Fix : bad call of extrafields into contact substitution
2014-05-12 01:53:41 +02:00
Laurent Destailleur
d4534f4a0b
Fix: [ bug #1384 ] Wrong name for import products and product prices
2014-05-11 17:52:16 +02:00
Marcos García de La Fuente
7b05944530
Corrected strings not translated and typos in English language
2014-05-11 13:14:45 +02:00
jfefe
45aa1b9136
Use hook for resource card
2014-05-11 12:11:58 +02:00
jfefe
901c083ce6
Fix : bad link to list into resource menu
2014-05-11 00:26:54 +02:00
Jean-François Ferry
6a9bf009f2
Clean code
2014-05-10 22:07:13 +02:00
Jean-François Ferry
c5e02edfa8
Add submenu for adding resource
2014-05-10 22:06:23 +02:00
Jean-François Ferry
1caffcffaf
Add new perm to link resource to an element
2014-05-10 22:06:23 +02:00
Jean-François Ferry
c04812cd15
Fix: bad lang file
2014-05-10 22:06:22 +02:00
Jean-François Ferry
e76ce87547
Remove unused css
2014-05-10 22:03:05 +02:00
Jean-François Ferry
6e24004e82
Remove resource module config page
2014-05-10 22:03:05 +02:00
Jean-François Ferry
e63f8b87c1
Mark resource module as experimental / need Dolibarr 3.5
2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d
Prepare structure for upstream merge
2014-05-10 22:03:05 +02:00
Laurent Destailleur
12055aa44a
I did a better fix to have no more dependencies between modules.
2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 18:57:04 +02:00
jfefe
31044f1f72
Fix : bad call of extrafields into contact substitution (works with socpeople)
2014-05-10 18:51:54 +02:00
Juanjo Menent
4e53b57313
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 17:54:13 +02:00
Laurent Destailleur
40577ab445
New: Can enter holiday for someone else if user has permission for.
2014-05-07 15:03:05 +02:00
Laurent Destailleur
9add45aea3
Qual: Mutualize code.
2014-05-07 13:22:02 +02:00
Laurent Destailleur
845f764f93
Increase default size of image
2014-05-07 12:21:14 +02:00
Marcos García de La Fuente
8681079fa7
Fixed CR
2014-05-07 10:42:13 +02:00
Laurent Destailleur
182dd774b6
Fix: phpunit regression
2014-05-07 09:54:36 +02:00
Laurent Destailleur
95b5094e94
Fix: phpunit regression
2014-05-07 09:33:56 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
99dc3598de
Fix: [ bug #1364 ] Duplicate Id on permission
2014-05-06 23:27:44 +02:00
Laurent Destailleur
647d431857
Fix: contact of delivery of order not visible into typhon pdf.
2014-05-06 13:43:41 +02:00
Laurent Destailleur
959b104b78
Fix: the pdf template name for typhon as not correctly set when enabling
...
module.
2014-05-06 13:31:30 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Laurent Destailleur
697f68c9a9
Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5
...
Conflicts:
ChangeLog
2014-05-04 17:43:47 +02:00
Laurent Destailleur
03f9f0bada
Fix: Pb of records not correctly cleaned when module marge is
...
uninstalled (conflict between 'margin' and 'margins').
2014-05-03 20:21:35 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
50c10d3d1e
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
...
Fix: Can disable features with CKEDITOR.
2014-05-03 02:20:26 +02:00
Laurent Destailleur
43253d877a
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
...
Fix: Can disable features with CKEDITOR.
2014-05-03 02:15:33 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Florian HENRY
2637305065
same
2014-05-01 18:15:32 +02:00
Florian HENRY
a4126fae66
[ bug #1341 ] Lastname not added by file or direct input in mass
...
e-mailing
2014-05-01 18:13:01 +02:00
Laurent Destailleur
0219d53f69
Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact
2014-05-01 11:22:32 +02:00
Laurent Destailleur
6a200105b9
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
ChangeLog
2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234
Merge pull request #1557 from defrance69/develop
...
export extrafields on bill & set real ref bordereau number
2014-05-01 11:09:16 +02:00
Laurent Destailleur
569d4cfd41
Merge pull request #1556 from FHenry/develop
...
Enable option clone target emailing
2014-05-01 11:08:05 +02:00
aspangaro
501b7209de
Move module trips into family "hr"
2014-05-01 04:57:49 +02:00
jfefe
fd45bb16bd
Fix : make ODT substitution for company after contacts
2014-04-30 19:18:51 +02:00
Jean-François Ferry
00cd616f4c
Add informations about contacts of thirdparty into ODT
2014-04-30 10:36:23 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
BENKE Charles
468f6fd5fb
Update modFournisseur.class.php
...
Add extrafields export feature on bill
2014-04-29 11:57:51 +02:00
BENKE Charles
b283ed73d1
Update modFacture.class.php
...
add export extrafields feature
2014-04-29 11:53:04 +02:00
Florian HENRY
7a46bdfc55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35
Enable option clone target emailing
2014-04-28 17:18:11 +02:00
Laurent Destailleur
4a23a8a789
Merge branch 'category_translate' of github.com:aternatik/dolibarr into
...
aternatik-category_translate
Conflicts:
ChangeLog
2014-04-28 02:39:56 +02:00
Laurent Destailleur
e5c5b15ecc
Qual: Start to clean module ECM (Code is to complex). Prepare for
...
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
2014-04-28 01:46:11 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
bd8cdd337a
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
2014-04-26 22:17:11 +02:00
jfefe
afaf5698a5
Fix : bad link to categorie admin page
2014-04-25 14:25:49 +02:00
Raphaël Doursenaud
a57b7d4ed2
Qual: Derived missing variable from a known one
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
7852020b3d
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
490b45ea7e
Qual: Wrong type in method documentation
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
e3fa0332f4
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
167457562e
Qual: Wrong variable name
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
8f215205fa
Qual: Wrong type in method documentation
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
79e2bf4737
Qual: Missing global declaration
2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
c4569b10d0
Qual: Wrong variable name
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
10a0994241
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
370996d5c4
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
32f5ecfaa3
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
6366a66efd
Qual: Wrong type in method documentation
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
9bb454b242
Qual: Wrong variable name
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
953e196a2c
Qual: Missing variable declaration
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
f357d3c5ab
Qual: Missing global declaration
2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
aa1ff28158
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
22263dc2c1
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e738a294e8
Qual: Wrong variable name
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
1d52f6d6c2
Qual: Fixed typo
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
e561cc87f7
Qual: Wrong variable name
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2abbc8845f
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
0d92abc037
Qual: Missing global declaration
2014-04-23 18:24:08 +02:00
Raphaël Doursenaud
2cfe27b434
Qual: Wrong type in method documentation
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
6174099827
Qual: Wrong type in method documentation
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
858d1dc8d0
Qual: Missing variable declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
db82a6f0e6
Qual: Missing global declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
988e7a137e
Qual: Missing global declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
f476bee0c7
Qual: Missing variable declaration
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
20983b4807
Qual: Removed unused variable
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
7497a72b1d
Qual: Removed dead code
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
4f3a28e7ed
Qual: Removed unused variable
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
5d74a5a852
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
70606d04ea
Qual: Missing global declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
e7d9423812
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
126d2522fd
Qual: Missing global declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
aacd657972
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
96e12e75bb
Qual: Missing variable declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
9c5db27a70
Qual: Wrong type in method documentation
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
592b738f96
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
71cd774d04
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
9960e5aa8f
Qual: Removed unused variable
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
1757c9d45e
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0a08f3c6e3
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
12ba751432
Qual: Missing global declaration
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
0cb58e0b52
Qual: Wrong variable name
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
8b5b7203d5
Qual: Missing global declaration
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
32ced9a502
Qual: Removed missing variable
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
3a7773081e
Qual: Missing method arguments
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
11125f98be
Qual: Missing global declaration
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
d1f59b73d7
Qual: Wrong variable name
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
b3630cc588
Qual: Missing variable declaration
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
2970ead6f3
Qual: Wrong type in method documentation
2014-04-23 18:24:04 +02:00
Raphaël Doursenaud
119e96a8b1
Qual: Missing global declaration
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
f4f4eca841
Qual: Wrong variable name
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
9e839f43e6
Qual: Wrong type in method documentation
2014-04-23 18:24:03 +02:00
Raphaël Doursenaud
fe05d3f2c4
Qual: Missing global declaration
2014-04-23 18:24:03 +02:00
BENKE Charles
0b78a04756
Update doc_generic_project_odt.modules.php
2014-04-19 12:32:01 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
ee3592c976
Fix: invert label for accountancy_code_sell
2014-04-18 11:21:15 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
7fcf57ca5a
Fix: SQL request for export. Extra field missing.
2014-04-10 18:36:34 +02:00
Laurent Destailleur
60b37dffe1
Fix: [ bug #1323 ] generation of odt files for tasks.
2014-04-09 00:07:32 +02:00
Laurent Destailleur
cf8ff97855
Fix: Install of odt templates for project and tasks failed.
2014-04-02 13:17:20 +02:00
Laurent Destailleur
7ac193bb80
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Laurent Destailleur
1fad693867
Fix: Removed useless strtolower
2014-03-31 02:25:35 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
4d4512fadd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-26 22:14:14 +01:00
Laurent Destailleur
62a990d6cc
Fix: ajax_combobox function must be included before called.
...
New: Feature of module survey are now localized into top menu "Tools".
2014-03-26 16:02:22 +01:00
Laurent Destailleur
f115501ddf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-24 00:16:47 +01:00
Laurent Destailleur
466de67b5b
Fix: Solve pb of too many embedded tables
2014-03-23 20:18:07 +01:00
Laurent Destailleur
a1e778c146
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-21 21:12:02 +01:00
Laurent Destailleur
1061a650d2
Fix: duplicate info
2014-03-21 21:11:51 +01:00
Laurent Destailleur
b2f6498236
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-21 15:03:37 +01:00
Laurent Destailleur
a884673637
Fix: A better to fix to manage automatic creation of code for import.
2014-03-21 13:29:13 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
d3e951e1ec
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-03-19 20:22:04 +01:00
Laurent Destailleur
2cced0bf43
Perf: Avoid makign a "desc table" for each row we import (for this we
...
are using a global cache array).
2014-03-19 20:02:39 +01:00
Laurent Destailleur
062c150bc1
Fix: import of fields with value "auto"
2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c
Fix: fails to import when value is 'AUTO' because compare was case
...
sensitive.
2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064
Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
...
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe
Fix PDF: Page break was ko when breaking 2 pages or more.
...
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
80088c87ac
Fix: Some debugs of module categories
2014-03-18 00:20:39 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
Laurent Destailleur
7974ae96ad
Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr
...
into aternatik-cat_extrafields
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-03-16 21:38:29 +01:00
Laurent Destailleur
ed4f7fd083
Fix: error
2014-03-16 20:05:07 +01:00
Laurent Destailleur
2d3c700a7d
Fix: When cloning product, autogenerating barcode must not use same
...
number.
Qual: Moved dedicated permission of module to "advance" permissions.
2014-03-16 17:37:54 +01:00
Jean-François Ferry
55750e16d8
Prepare extrafields into categories
2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
685c00cd27
Fix : Delivery date was displayed twice
2014-03-15 17:55:57 +01:00
Florian Henry
7625629491
Fix [ bug #1294 ] Expedition model Merou having problems with long names
2014-03-15 16:40:29 +01:00
Florian Henry
18c4d890dd
Fix [ bug #1283 ] ROUGET Shipment PDF
2014-03-15 16:32:46 +01:00
Florian Henry
3f6b319d41
Fix deposit invoice
2014-03-14 23:42:45 +01:00
philippe grand
f9c48be2a9
fix : display specimen
2014-03-14 18:23:37 +01:00
Laurent Destailleur
32364ac18b
Move skype module from experimental to stable.
2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd
New: Add a public url as a property for products/services.
2014-03-14 13:51:46 +01:00
Marcos García de La Fuente
4433f6e8b7
Missing copyright info
2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3
Corrected array indentation
2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f
Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags
2014-03-06 08:55:37 +01:00
Laurent Destailleur
16a074a69b
Use better module id number
2014-03-05 12:25:31 +01:00
KreizIT
7f275dfbf4
- Add table modification for product (forget in step 1)
...
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Laurent Destailleur
fd9d0747c8
Fix: Bad description
2014-03-02 16:44:31 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
BENKE Charles
303c459777
Update modProjet.class.php
...
bad incrementation
2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a
Merge pull request #1421 from defrance69/patch-30
...
Update modProjet.class.php
2014-02-27 11:19:28 +01:00
Laurent Destailleur
06b1c8b64a
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
2014-02-27 10:47:15 +01:00
philippe
5c4ceb1a53
anglicized
2014-02-27 10:06:11 +01:00
philippe
1223e6a08b
anglicized
2014-02-27 09:54:31 +01:00
Laurent Destailleur
4be679a7b2
Second try for Fix: The delivery date was missing.
2014-02-26 17:25:32 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
9505f9e47c
Fix: The delivery date was missing.
2014-02-26 15:41:56 +01:00
Laurent Destailleur
a822bc0736
Fix: The delivery date was missing.
2014-02-25 19:22:00 +01:00
Laurent Destailleur
abff284ab1
Fix: The delivery date was missing.
2014-02-25 19:07:42 +01:00
Laurent Destailleur
7241714551
Merge pull request #1435 from marcosgdf/export-translations
...
Corrected export translations
2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
f7eb4c5b14
Updated user export labels
2014-02-25 04:39:41 +01:00
Marcos García de La Fuente
4411908b23
Fixed translations of project export wizard
2014-02-25 04:18:13 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Laurent Destailleur
e5136487bd
Fix: The customer code was set to uppercase when using numbering module
...
leopard. We must keep data safe of any change.
2014-02-20 16:51:37 +01:00
Laurent Destailleur
96e7985266
Fix: Translation of menu entries must not be into admin lang file (We
...
don't want to load this file for common pages).
2014-02-19 02:27:13 +01:00
Laurent Destailleur
2e67bbc382
Maxi debug of barcode feature.
...
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c
Qual: Clean code for adding menu entries into Modules system admin
...
entry.
New: Add entry for admin page Mass barcode init.
2014-02-18 20:49:22 +01:00
BENKE Charles
8ac8af0f40
Update modProjet.class.php
...
bad incrementation
2014-02-17 12:12:18 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
b94f7a6a6d
Fix some amount were missing local version.
2014-02-08 03:51:30 +01:00
Laurent Destailleur
b714347b6b
Fix: Substition of extra field was ko for order.
2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6
Removed some TODO
2014-02-06 20:45:50 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
ba931e18d4
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-31 18:12:54 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
85436f871c
Sec: Missing permission tests
2014-01-30 11:48:14 +01:00
Laurent Destailleur
8abde9e11f
Sec: Missing permission tests
2014-01-30 11:44:31 +01:00
Laurent Destailleur
bb1575e0e6
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-24 10:20:03 +01:00
Laurent Destailleur
3852fe4a1c
Merge pull request #1380 from atm-alexis/3.5
...
Add right to export project in export tool
2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-01-21 13:23:27 +01:00
Léo
46926aa685
Fix: modBarcode issue with blank list in conf (?)
...
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 13:19:32 +01:00
Maxime Kohlhaas
60e616f63e
Fix : big bug while importing thirds, codes were not properly set or not imported
2014-01-21 10:29:35 +01:00
Léo
6c00fc33f2
Fix: modBarcode issue with blank list in conf (?)
...
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 00:54:26 +01:00
Laurent Destailleur
8d8e016115
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
Laurent Destailleur
1ebd56c4ee
New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE
2014-01-20 00:40:01 +01:00
Laurent Destailleur
5f58bff981
Use _ instead of - for option SUPPLIER_REF_IN_NAME
2014-01-19 22:59:37 +01:00
Laurent Destailleur
cbf6e8563d
New: Add option SUPPLIER_REF_IN_NAME
2014-01-19 22:00:02 +01:00
Christophe Battarel
0bdcd108f5
Add supplier informations in product export (supplier name, supplier product ref and supplier unit price)
2014-01-16 11:04:56 +01:00
Laurent Destailleur
ad5fc43e5b
doxygen
2014-01-15 18:20:24 +01:00
Alexis Algoud
9a5b46330a
Add right to export project in export tool
...
As the right does not exist, the tool could never be exploited
2014-01-15 14:49:22 +01:00
Laurent Destailleur
bd1a10c116
Fix: doxygen
2014-01-14 16:49:06 +01:00
