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
BENKE Charles
28204d66b1
Update modFacture.class.php
...
remplace price by subprice on export invoice
2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd
Merge pull request #1372 from defrance69/patch-23
...
Update modFacture.class.php
2014-01-12 05:58:04 -08:00
Laurent Destailleur
06aa3b8250
Merge branch 'opensurvey-improvements' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements
Conflicts:
ChangeLog
2014-01-12 14:50:00 +01:00
BENKE Charles
dd3da37ce6
Update modFacture.class.php
...
remplace price by subprice on export invoice
2014-01-10 10:35:42 +01:00
Laurent Destailleur
c0c555b78f
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-08 15:16:56 +01:00
Laurent Destailleur
622fe72abf
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
2014-01-08 15:13:41 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
e99883f1a6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/admin/modules.php
2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2014-01-06 19:13:40 +01:00
Marcos García de La Fuente
2393e7c732
Moved creation poll wizard out of public folder
2014-01-05 19:03:33 +01:00
Marcos García de La Fuente
8d96675607
Force logged user to create surveys and applied Dolibarr style to poll creation wizard
2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
6397b0b7aa
Improving the use of permissions in opensurvey module
2014-01-05 06:18:26 +01:00
Laurent Destailleur
5a7fe6b4a7
Fix: Change to make debian package ok despite removal of ckeditor
...
package.
2014-01-05 01:17:38 +01:00
Laurent Destailleur
ee1e7471ff
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
2014-01-04 16:13:34 +01:00
Laurent Destailleur
f6cda9deb6
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d
New: Add menu entry to barcode genration page.
2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
694fd5810a
Removed unuseful opensurvey admin page
2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
build/debian/changelog
2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096
Fix: doxygen
2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
2014-01-02 20:45:59 +01:00
Laurent Destailleur
f0151ce112
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584
Fix: Better translation
2013-12-29 19:30:11 +01:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191
Fix: Can import contacts not linked to any thirdparties.
2013-12-24 16:11:23 +01:00
Laurent Destailleur
11e0fb8f7a
Fix: Missing ref field into export.
2013-12-17 09:11:36 +01:00
Laurent Destailleur
c34e50114a
Start to work on a basic print sticker tool
2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Laurent Destailleur
4d9712ea4c
Merge pull request #1318 from csalvador/develop-fichinterPDF
...
Develop fichinter pdf
2013-12-04 09:41:13 -08:00
Laurent Destailleur
b6386a3dce
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/tpl/objectline_add.tpl.php
2013-12-01 16:08:03 +01:00
Grand Philippe
5b2f9af7dc
fix management of all errors messages
2013-11-28 16:44:57 +01:00
Cédric Salvador
2b6a5508c7
debug the Soleil model
2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076
show signature space on the last page only
2013-11-22 09:51:47 +01:00
BENKE Charles
1bb7ddc2b1
Update modAgenda.class.php
...
export extensions
2013-11-21 17:32:11 +01:00
Laurent Destailleur
358175b357
Merge remote-tracking branch 'origin/3.4' into develop
2013-11-20 23:48:06 +01:00
Florian Henry
f88e9425ec
Remove useless code (the tag replacement into footer and header is
...
already done by SetVar method)
2013-11-20 14:01:43 +01:00
Regis Houssin
4c29bddfda
Fix: wrong variable name
...
Fix: restore address.class.php, this class is used
2013-11-20 09:40:56 +01:00
Laurent Destailleur
b7190d2609
Fix: Several bugs.
2013-11-16 13:00:21 +01:00
aspangaro
86a2da31b4
Fix for document cerfa into module Don
2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5
Fix for document cerfa into module Don
2013-11-10 06:37:08 +01:00
Raphaël Doursenaud
c845124b92
Object type is lowercase
2013-11-07 21:47:13 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Laurent Destailleur
a9a2bd9eec
Fix error reported by travis.
2013-11-05 14:39:25 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Laurent Destailleur
c51ff1d462
New: Add hidden option to disable log handlers.
2013-10-30 19:08:41 +01:00
Laurent Destailleur
93c5720579
New: Add path to installed dir of external modules + Name and web of
...
module provider.
2013-10-28 01:37:04 +01:00
Laurent Destailleur
966f135316
Fix: Migration must load new boxes
2013-10-26 16:18:28 +02:00
Laurent Destailleur
16bcd6b5e5
Add error management to avoid blank page when there is no permission to
...
read file.
2013-10-23 19:19:54 +02:00
Laurent Destailleur
ca560b4f98
Fix: [ bug #1076 ] Shipment/Delivery PDFs
2013-10-23 18:02:16 +02:00
Maxime Kohlhaas
845deb9a63
Add multilang management in ODT models
2013-10-08 09:17:04 +02:00
Laurent Destailleur
141258f514
Merge remote-tracking branch 'origin/3.4' into develop
...
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT
Conflicts:
htdocs/fourn/product/liste.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2013-10-07 16:17:51 +02:00
Laurent Destailleur
db7bcfd748
Fix: Sending email from thirdparty must add event into agenda if option
...
is on.
2013-09-25 21:36:40 +02:00
Laurent Destailleur
072247f1c8
Fix: Use correct translation key
2013-09-25 19:07:25 +02:00
Laurent Destailleur
d111ee97c2
Doc
2013-09-25 12:37:19 +02:00
Laurent Destailleur
26bce0a385
Merge pull request #1207 from defrance69/patch-12
...
Update modProjet.class.php
2013-09-23 00:39:03 -07:00
Laurent Destailleur
b57ed72fc1
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
Laurent Destailleur
c2ba7956ab
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48
Fix: Better management of pdf generation when tcpdf not available.
2013-09-22 19:53:27 +02:00
Laurent Destailleur
9826b202e9
New: Provide both tags for string formated amount and numeric amount
...
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
2013-09-16 12:42:01 +02:00
simnandez
59783cf556
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-15 11:52:57 +02:00
simnandez
4c7907b773
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-15 11:47:31 +02:00
BENKE Charles
5e9cb8a1d4
Update modProjet.class.php
...
add export_dependencies_array
2013-09-14 10:45:41 +02:00
Laurent Destailleur
d22985c5fa
More accurate log file
2013-09-09 12:23:15 +02:00
Laurent Destailleur
3a8784a6de
Qual: Mutualize code
2013-09-07 19:08:08 +02:00
Laurent Destailleur
d493dc8513
Merge pull request #1215 from GPCsolutions/develop-review
...
Develop review
2013-09-05 13:51:28 -07:00
Raphaël Doursenaud
0e8eddb470
Revert "Method should be static"
...
This reverts commit 4ca5bc3797
2013-09-05 19:00:00 +02:00
Juanjo Menent
15bb60c8a1
Merge pull request #1212 from FHenry/develop
...
Add ref supplier into muscadet model
2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
4efe215b0c
Qual: removed a bunch of duplicated array keys
2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
4ca5bc3797
Method should be static
2013-09-05 16:44:02 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Florian Henry
d8ddb8b3e7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f
Add ref supplier into muscadet model
2013-09-03 20:07:08 +02:00
BENKE Charles
bb8f8332f9
Update modProjet.class.php
...
enhance export feature with
left join and projet_task_time data
2013-09-03 11:12:29 +02:00
Grand Philippe
da384dda18
uniformize
2013-09-02 11:53:07 +02:00
Laurent Destailleur
cb52af4f47
Qual: Make code more generic
2013-09-02 02:14:16 +02:00
Laurent Destailleur
1ba382d7a6
Merge pull request #1202 from FHenry/develop
...
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Laurent Destailleur
a8096c7359
New: Export/import profile include state.
2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5
[ task #1044 ] Add option to enabled thirdparty number into select
...
thirdparty list
2013-08-30 18:18:58 +02:00
Florian Henry
29396bd51a
Change SQL syntax
2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb
adjust spacing
2013-08-28 16:50:38 +02:00
Florian Henry
650689d294
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-08-28 16:49:22 +02:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
simnandez
34fe1fba7f
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Grand Philippe
24e6042378
some fix for contract model
2013-08-26 15:32:56 +02:00
Grand Philippe
7a64ad1a26
some fix for contract model and clean code
2013-08-26 14:29:46 +02:00
Laurent Destailleur
07cba2d232
Merge pull request #1194 from grandoc/develop
...
fix : warning during install
2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Grand Philippe
a0c04a548b
first step to complete contract functionalities
2013-08-24 15:59:49 +02:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Laurent Destailleur
05040d1997
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-21 22:21:33 +02:00
Christophe Battarel
8128ed0556
define user permissions on margin module
...
update changelog
2013-08-20 12:00:16 +02:00
Laurent Destailleur
b18d5166de
Fix: Size of picture into PDF
2013-08-19 13:30:30 +02:00
simnandez
5cbfa61731
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:42:01 +02:00
simnandez
6b1484c2ea
Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count
2013-08-08 17:11:54 +02:00
simnandez
b9e1a57f67
Fix: [ bug #1029 ] Tulip numbering mask
2013-08-08 10:00:06 +02:00
Laurent Destailleur
0f86755033
Fix: Found a dozen of bugs into sub module delivery of module shipment.
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717
Fix: Found a dozen of bugs into sub module delivery of module shipment.
2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33
Fix: Bad dir
2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4
Fix: Bad var name
2013-08-07 13:33:22 +02:00
Juanjo Menent
aab90bfe76
Merge pull request #1154 from atm-maxime/develop
...
Fix : supplier invoice mask + numbering
2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e
Numbering should be on invoice date, not creation date
2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905
Fix : supplier invoice mask + numbering
2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39
Fix: Tons of regression after renaming note field into note_private.
2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298
Fix: Tons of regression after renaming note field into note_private.
...
Qual: Add phpunit test to test all exports descriptors.
2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6
Fix: lang file
2013-08-06 03:56:59 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
218e9f5b33
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-08-05 18:55:38 +02:00
Laurent Destailleur
85572a4bd1
New: Start to work on box for product distributions
...
Qual: Start to move code of dol_print_graph function into class
DolGraph.
2013-08-05 17:19:49 +02:00
simnandez
283d9eb064
Text for invoices numbering modules more clear. Update ChangeLog
2013-08-02 15:27:37 +02:00
simnandez
6d1a021382
New: [ task #1005 ] Update mercure module with replacement invoices.
2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74
New: [ task #1005 ] Improves and best adaptations
2013-08-02 10:44:14 +02:00
Laurent Destailleur
a35ee022f3
Merge pull request #1150 from atm-maxime/develop
...
Task # 1016 : deposits numbering
2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b
Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain.
2013-08-01 18:44:21 +02:00
Laurent Destailleur
4f464eb226
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/modules/export/export_excel2007.modules.php
htdocs/langs/en_US/errors.lang
htdocs/langs/fr_FR/agenda.lang
htdocs/langs/fr_FR/errors.lang
2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e
Fix: [ bug #1009 ] ZipArchive' not found
2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7
Task # 1016 : can define a specific numbering for deposits
2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a
Fix: Pb into export descriptions
2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962
Fix: Export of country
2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229
Fix: Pb into export descriptions
2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd
Fix: Export of country
2013-08-01 12:49:46 +02:00
Florian Henry
325ceda4dc
[ task #1014 ] Add option to recursivly add parent cactegory
2013-07-31 21:52:49 +02:00
Laurent Destailleur
e234d5342d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Florian Henry
21bdabc248
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877
Fix extrafeild thirdparty import and export
2013-07-30 14:18:56 +02:00
Laurent Destailleur
1c24f9e35e
Merge pull request #1138 from atm-maxime/3.4
...
Fix : Numbering on supplier invoice was not saved and on shipment displa...
2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
f9c2910f84
Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok
2013-07-30 09:21:45 +02:00
Florian Henry
d6f31d61bf
Fix Typhon model $mysoc global is missing
2013-07-29 12:21:52 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
daa10bcedd
Fix: EOF
2013-07-27 12:32:04 +02:00
Laurent Destailleur
5608e320f7
New: Can add a suffix into filename of template after -. This may be
...
used in future as specific criteria to filter list of numbering models
to show.
2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2013-07-26 14:59:18 +02:00
simnandez
7efacecb08
New: [ task #1005 ] Adapting to Spanish legislation bill numbering
2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b
CRLF issue
2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c
New: Can show images of product onto proposals.
2013-07-26 12:24:30 +02:00
Laurent Destailleur
339118d6f4
Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee
Fix: Color no more lost
2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932
Merge pull request #1128 from defrance69/patch-9
...
Update pdf_blochet.class.php
2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/langs/ar_SA/bookmarks.lang
htdocs/langs/ar_SA/boxes.lang
htdocs/langs/ar_SA/cashdesk.lang
htdocs/langs/ar_SA/categories.lang
htdocs/langs/ar_SA/commercial.lang
htdocs/langs/ar_SA/companies.lang
htdocs/langs/ar_SA/compta.lang
htdocs/langs/ar_SA/contracts.lang
htdocs/langs/ar_SA/deliveries.lang
htdocs/langs/ar_SA/dict.lang
htdocs/langs/ar_SA/donations.lang
htdocs/langs/ar_SA/ecm.lang
htdocs/langs/ar_SA/errors.lang
htdocs/langs/ar_SA/exports.lang
htdocs/langs/ar_SA/externalsite.lang
htdocs/langs/ar_SA/ftp.lang
htdocs/langs/ar_SA/help.lang
htdocs/langs/ar_SA/install.lang
htdocs/langs/ar_SA/interventions.lang
htdocs/langs/ar_SA/languages.lang
htdocs/langs/ar_SA/ldap.lang
htdocs/langs/ar_SA/mails.lang
htdocs/langs/ar_SA/main.lang
htdocs/langs/ar_SA/members.lang
htdocs/langs/ar_SA/orders.lang
htdocs/langs/ar_SA/oscommerce.lang
htdocs/langs/ar_SA/paybox.lang
htdocs/langs/ar_SA/paypal.lang
htdocs/langs/ar_SA/projects.lang
htdocs/langs/ar_SA/propal.lang
htdocs/langs/ar_SA/sendings.lang
htdocs/langs/ar_SA/shop.lang
htdocs/langs/ar_SA/sms.lang
htdocs/langs/ar_SA/stocks.lang
htdocs/langs/ar_SA/suppliers.lang
htdocs/langs/ar_SA/trips.lang
htdocs/langs/ar_SA/users.lang
htdocs/langs/ar_SA/withdrawals.lang
htdocs/langs/ar_SA/workflow.lang
htdocs/langs/bg_BG/admin.lang
htdocs/langs/bg_BG/agenda.lang
htdocs/langs/bg_BG/banks.lang
htdocs/langs/bg_BG/bills.lang
htdocs/langs/bg_BG/bookmarks.lang
htdocs/langs/bg_BG/boxes.lang
htdocs/langs/bg_BG/cashdesk.lang
htdocs/langs/bg_BG/categories.lang
htdocs/langs/bg_BG/commercial.lang
htdocs/langs/bg_BG/companies.lang
htdocs/langs/bg_BG/compta.lang
htdocs/langs/bg_BG/contracts.lang
htdocs/langs/bg_BG/deliveries.lang
htdocs/langs/bg_BG/dict.lang
htdocs/langs/bg_BG/donations.lang
htdocs/langs/bg_BG/ecm.lang
htdocs/langs/bg_BG/errors.lang
htdocs/langs/bg_BG/exports.lang
htdocs/langs/bg_BG/externalsite.lang
htdocs/langs/bg_BG/ftp.lang
htdocs/langs/bg_BG/help.lang
htdocs/langs/bg_BG/holiday.lang
htdocs/langs/bg_BG/install.lang
htdocs/langs/bg_BG/interventions.lang
htdocs/langs/bg_BG/languages.lang
htdocs/langs/bg_BG/ldap.lang
htdocs/langs/bg_BG/mailmanspip.lang
htdocs/langs/bg_BG/mails.lang
htdocs/langs/bg_BG/main.lang
htdocs/langs/bg_BG/members.lang
htdocs/langs/bg_BG/orders.lang
htdocs/langs/bg_BG/oscommerce.lang
htdocs/langs/bg_BG/other.lang
htdocs/langs/bg_BG/paybox.lang
htdocs/langs/bg_BG/paypal.lang
htdocs/langs/bg_BG/products.lang
htdocs/langs/bg_BG/projects.lang
htdocs/langs/bg_BG/propal.lang
htdocs/langs/bg_BG/sendings.lang
htdocs/langs/bg_BG/shop.lang
htdocs/langs/bg_BG/sms.lang
htdocs/langs/bg_BG/stocks.lang
htdocs/langs/bg_BG/suppliers.lang
htdocs/langs/bg_BG/trips.lang
htdocs/langs/bg_BG/users.lang
htdocs/langs/bg_BG/withdrawals.lang
htdocs/langs/bg_BG/workflow.lang
htdocs/langs/ca_ES/paybox.lang
htdocs/langs/da_DK/agenda.lang
htdocs/langs/da_DK/banks.lang
htdocs/langs/da_DK/bookmarks.lang
htdocs/langs/da_DK/boxes.lang
htdocs/langs/da_DK/cashdesk.lang
htdocs/langs/da_DK/categories.lang
htdocs/langs/da_DK/commercial.lang
htdocs/langs/da_DK/companies.lang
htdocs/langs/da_DK/compta.lang
htdocs/langs/da_DK/contracts.lang
htdocs/langs/da_DK/deliveries.lang
htdocs/langs/da_DK/dict.lang
htdocs/langs/da_DK/donations.lang
htdocs/langs/da_DK/errors.lang
htdocs/langs/da_DK/exports.lang
htdocs/langs/da_DK/externalsite.lang
htdocs/langs/da_DK/ftp.lang
htdocs/langs/da_DK/install.lang
htdocs/langs/da_DK/interventions.lang
htdocs/langs/da_DK/languages.lang
htdocs/langs/da_DK/mails.lang
htdocs/langs/da_DK/members.lang
htdocs/langs/da_DK/orders.lang
htdocs/langs/da_DK/oscommerce.lang
htdocs/langs/da_DK/paybox.lang
htdocs/langs/da_DK/paypal.lang
htdocs/langs/da_DK/projects.lang
htdocs/langs/da_DK/propal.lang
htdocs/langs/da_DK/sendings.lang
htdocs/langs/da_DK/shop.lang
htdocs/langs/da_DK/sms.lang
htdocs/langs/da_DK/stocks.lang
htdocs/langs/da_DK/suppliers.lang
htdocs/langs/da_DK/trips.lang
htdocs/langs/da_DK/users.lang
htdocs/langs/da_DK/withdrawals.lang
htdocs/langs/da_DK/workflow.lang
htdocs/langs/de_DE/admin.lang
htdocs/langs/de_DE/agenda.lang
htdocs/langs/de_DE/banks.lang
htdocs/langs/de_DE/bills.lang
htdocs/langs/de_DE/bookmarks.lang
htdocs/langs/de_DE/boxes.lang
htdocs/langs/de_DE/cashdesk.lang
htdocs/langs/de_DE/categories.lang
htdocs/langs/de_DE/commercial.lang
htdocs/langs/de_DE/companies.lang
htdocs/langs/de_DE/compta.lang
htdocs/langs/de_DE/contracts.lang
htdocs/langs/de_DE/deliveries.lang
htdocs/langs/de_DE/dict.lang
htdocs/langs/de_DE/donations.lang
htdocs/langs/de_DE/ecm.lang
htdocs/langs/de_DE/errors.lang
htdocs/langs/de_DE/exports.lang
htdocs/langs/de_DE/externalsite.lang
htdocs/langs/de_DE/ftp.lang
htdocs/langs/de_DE/help.lang
htdocs/langs/de_DE/install.lang
htdocs/langs/de_DE/interventions.lang
htdocs/langs/de_DE/languages.lang
htdocs/langs/de_DE/ldap.lang
htdocs/langs/de_DE/mails.lang
htdocs/langs/de_DE/main.lang
htdocs/langs/de_DE/members.lang
htdocs/langs/de_DE/orders.lang
htdocs/langs/de_DE/oscommerce.lang
htdocs/langs/de_DE/other.lang
htdocs/langs/de_DE/paybox.lang
htdocs/langs/de_DE/paypal.lang
htdocs/langs/de_DE/products.lang
htdocs/langs/de_DE/projects.lang
htdocs/langs/de_DE/propal.lang
htdocs/langs/de_DE/sendings.lang
htdocs/langs/de_DE/shop.lang
htdocs/langs/de_DE/sms.lang
htdocs/langs/de_DE/stocks.lang
htdocs/langs/de_DE/suppliers.lang
htdocs/langs/de_DE/trips.lang
htdocs/langs/de_DE/users.lang
htdocs/langs/de_DE/withdrawals.lang
htdocs/langs/de_DE/workflow.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/langs/en_US/bookmarks.lang
htdocs/langs/en_US/ftp.lang
htdocs/langs/en_US/other.lang
htdocs/langs/en_US/paypal.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/bookmarks.lang
htdocs/langs/et_EE/boxes.lang
htdocs/langs/et_EE/cashdesk.lang
htdocs/langs/et_EE/categories.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/contracts.lang
htdocs/langs/et_EE/deliveries.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/donations.lang
htdocs/langs/et_EE/ecm.lang
htdocs/langs/et_EE/errors.lang
htdocs/langs/et_EE/exports.lang
htdocs/langs/et_EE/externalsite.lang
htdocs/langs/et_EE/ftp.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/install.lang
htdocs/langs/et_EE/interventions.lang
htdocs/langs/et_EE/languages.lang
htdocs/langs/et_EE/ldap.lang
htdocs/langs/et_EE/mails.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/members.lang
htdocs/langs/et_EE/orders.lang
htdocs/langs/et_EE/oscommerce.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/paybox.lang
htdocs/langs/et_EE/paypal.lang
htdocs/langs/et_EE/products.lang
htdocs/langs/et_EE/projects.lang
htdocs/langs/et_EE/propal.lang
htdocs/langs/et_EE/sendings.lang
htdocs/langs/et_EE/shop.lang
htdocs/langs/et_EE/sms.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/trips.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/et_EE/workflow.lang
htdocs/langs/fa_IR/agenda.lang
htdocs/langs/fa_IR/banks.lang
htdocs/langs/fa_IR/bookmarks.lang
htdocs/langs/fa_IR/boxes.lang
htdocs/langs/fa_IR/categories.lang
htdocs/langs/fa_IR/commercial.lang
htdocs/langs/fa_IR/companies.lang
htdocs/langs/fa_IR/compta.lang
htdocs/langs/fa_IR/contracts.lang
htdocs/langs/fa_IR/deliveries.lang
htdocs/langs/fa_IR/dict.lang
htdocs/langs/fa_IR/donations.lang
htdocs/langs/fa_IR/ecm.lang
htdocs/langs/fa_IR/errors.lang
htdocs/langs/fa_IR/exports.lang
htdocs/langs/fa_IR/ftp.lang
htdocs/langs/fa_IR/help.lang
htdocs/langs/fa_IR/install.lang
htdocs/langs/fa_IR/interventions.lang
htdocs/langs/fa_IR/languages.lang
htdocs/langs/fa_IR/ldap.lang
htdocs/langs/fa_IR/mails.lang
htdocs/langs/fa_IR/main.lang
htdocs/langs/fa_IR/members.lang
htdocs/langs/fa_IR/orders.lang
htdocs/langs/fa_IR/oscommerce.lang
htdocs/langs/fa_IR/paybox.lang
htdocs/langs/fa_IR/paypal.lang
htdocs/langs/fa_IR/projects.lang
htdocs/langs/fa_IR/propal.lang
htdocs/langs/fa_IR/shop.lang
htdocs/langs/fa_IR/stocks.lang
htdocs/langs/fa_IR/suppliers.lang
htdocs/langs/fa_IR/trips.lang
htdocs/langs/fa_IR/users.lang
htdocs/langs/fa_IR/withdrawals.lang
htdocs/langs/fi_FI/agenda.lang
htdocs/langs/fi_FI/banks.lang
htdocs/langs/fi_FI/bookmarks.lang
htdocs/langs/fi_FI/boxes.lang
htdocs/langs/fi_FI/cashdesk.lang
htdocs/langs/fi_FI/categories.lang
htdocs/langs/fi_FI/commercial.lang
htdocs/langs/fi_FI/companies.lang
htdocs/langs/fi_FI/compta.lang
htdocs/langs/fi_FI/contracts.lang
htdocs/langs/fi_FI/deliveries.lang
htdocs/langs/fi_FI/dict.lang
htdocs/langs/fi_FI/donations.lang
htdocs/langs/fi_FI/errors.lang
htdocs/langs/fi_FI/exports.lang
htdocs/langs/fi_FI/externalsite.lang
htdocs/langs/fi_FI/ftp.lang
htdocs/langs/fi_FI/install.lang
htdocs/langs/fi_FI/interventions.lang
htdocs/langs/fi_FI/languages.lang
htdocs/langs/fi_FI/mails.lang
htdocs/langs/fi_FI/members.lang
htdocs/langs/fi_FI/orders.lang
htdocs/langs/fi_FI/paybox.lang
htdocs/langs/fi_FI/paypal.lang
htdocs/langs/fi_FI/projects.lang
htdocs/langs/fi_FI/propal.lang
htdocs/langs/fi_FI/sendings.lang
htdocs/langs/fi_FI/sms.lang
htdocs/langs/fi_FI/stocks.lang
htdocs/langs/fi_FI/suppliers.lang
htdocs/langs/fi_FI/trips.lang
htdocs/langs/fi_FI/users.lang
htdocs/langs/fi_FI/withdrawals.lang
htdocs/langs/fi_FI/workflow.lang
htdocs/langs/fr_FR/bookmarks.lang
htdocs/langs/fr_FR/externalsite.lang
htdocs/langs/fr_FR/other.lang
htdocs/langs/fr_FR/paybox.lang
htdocs/langs/fr_FR/paypal.lang
htdocs/langs/he_IL/workflow.lang
htdocs/langs/hu_HU/admin.lang
htdocs/langs/hu_HU/agenda.lang
htdocs/langs/hu_HU/banks.lang
htdocs/langs/hu_HU/bills.lang
htdocs/langs/hu_HU/boxes.lang
htdocs/langs/hu_HU/cashdesk.lang
htdocs/langs/hu_HU/commercial.lang
htdocs/langs/hu_HU/companies.lang
htdocs/langs/hu_HU/compta.lang
htdocs/langs/hu_HU/contracts.lang
htdocs/langs/hu_HU/deliveries.lang
htdocs/langs/hu_HU/dict.lang
htdocs/langs/hu_HU/donations.lang
htdocs/langs/hu_HU/errors.lang
htdocs/langs/hu_HU/exports.lang
htdocs/langs/hu_HU/externalsite.lang
htdocs/langs/hu_HU/install.lang
htdocs/langs/hu_HU/interventions.lang
htdocs/langs/hu_HU/languages.lang
htdocs/langs/hu_HU/mails.lang
htdocs/langs/hu_HU/main.lang
htdocs/langs/hu_HU/members.lang
htdocs/langs/hu_HU/orders.lang
htdocs/langs/hu_HU/oscommerce.lang
htdocs/langs/hu_HU/other.lang
htdocs/langs/hu_HU/paybox.lang
htdocs/langs/hu_HU/paypal.lang
htdocs/langs/hu_HU/projects.lang
htdocs/langs/hu_HU/propal.lang
htdocs/langs/hu_HU/sendings.lang
htdocs/langs/hu_HU/sms.lang
htdocs/langs/hu_HU/stocks.lang
htdocs/langs/hu_HU/suppliers.lang
htdocs/langs/hu_HU/trips.lang
htdocs/langs/hu_HU/users.lang
htdocs/langs/hu_HU/withdrawals.lang
htdocs/langs/hu_HU/workflow.lang
htdocs/langs/is_IS/agenda.lang
htdocs/langs/is_IS/banks.lang
htdocs/langs/is_IS/bookmarks.lang
htdocs/langs/is_IS/boxes.lang
htdocs/langs/is_IS/cashdesk.lang
htdocs/langs/is_IS/categories.lang
htdocs/langs/is_IS/commercial.lang
htdocs/langs/is_IS/companies.lang
htdocs/langs/is_IS/compta.lang
htdocs/langs/is_IS/contracts.lang
htdocs/langs/is_IS/deliveries.lang
htdocs/langs/is_IS/dict.lang
htdocs/langs/is_IS/donations.lang
htdocs/langs/is_IS/ecm.lang
htdocs/langs/is_IS/errors.lang
htdocs/langs/is_IS/exports.lang
htdocs/langs/is_IS/externalsite.lang
htdocs/langs/is_IS/ftp.lang
htdocs/langs/is_IS/help.lang
htdocs/langs/is_IS/install.lang
htdocs/langs/is_IS/interventions.lang
htdocs/langs/is_IS/languages.lang
htdocs/langs/is_IS/ldap.lang
htdocs/langs/is_IS/mails.lang
htdocs/langs/is_IS/main.lang
htdocs/langs/is_IS/members.lang
htdocs/langs/is_IS/orders.lang
htdocs/langs/is_IS/oscommerce.lang
htdocs/langs/is_IS/paybox.lang
htdocs/langs/is_IS/paypal.lang
htdocs/langs/is_IS/products.lang
htdocs/langs/is_IS/projects.lang
htdocs/langs/is_IS/propal.lang
htdocs/langs/is_IS/sendings.lang
htdocs/langs/is_IS/shop.lang
htdocs/langs/is_IS/sms.lang
htdocs/langs/is_IS/stocks.lang
htdocs/langs/is_IS/suppliers.lang
htdocs/langs/is_IS/trips.lang
htdocs/langs/is_IS/users.lang
htdocs/langs/is_IS/withdrawals.lang
htdocs/langs/is_IS/workflow.lang
htdocs/langs/it_IT/bookmarks.lang
htdocs/langs/it_IT/cashdesk.lang
htdocs/langs/it_IT/errors.lang
htdocs/langs/it_IT/exports.lang
htdocs/langs/it_IT/externalsite.lang
htdocs/langs/it_IT/languages.lang
htdocs/langs/it_IT/paybox.lang
htdocs/langs/it_IT/paypal.lang
htdocs/langs/it_IT/projects.lang
htdocs/langs/it_IT/propal.lang
htdocs/langs/it_IT/sendings.lang
htdocs/langs/it_IT/sms.lang
htdocs/langs/it_IT/workflow.lang
htdocs/langs/ja_JP/admin.lang
htdocs/langs/ja_JP/agenda.lang
htdocs/langs/ja_JP/banks.lang
htdocs/langs/ja_JP/bills.lang
htdocs/langs/ja_JP/bookmarks.lang
htdocs/langs/ja_JP/boxes.lang
htdocs/langs/ja_JP/cashdesk.lang
htdocs/langs/ja_JP/categories.lang
htdocs/langs/ja_JP/commercial.lang
htdocs/langs/ja_JP/companies.lang
htdocs/langs/ja_JP/compta.lang
htdocs/langs/ja_JP/contracts.lang
htdocs/langs/ja_JP/deliveries.lang
htdocs/langs/ja_JP/dict.lang
htdocs/langs/ja_JP/donations.lang
htdocs/langs/ja_JP/ecm.lang
htdocs/langs/ja_JP/errors.lang
htdocs/langs/ja_JP/exports.lang
htdocs/langs/ja_JP/externalsite.lang
htdocs/langs/ja_JP/ftp.lang
htdocs/langs/ja_JP/help.lang
htdocs/langs/ja_JP/install.lang
htdocs/langs/ja_JP/interventions.lang
htdocs/langs/ja_JP/languages.lang
htdocs/langs/ja_JP/ldap.lang
htdocs/langs/ja_JP/mails.lang
htdocs/langs/ja_JP/main.lang
htdocs/langs/ja_JP/members.lang
htdocs/langs/ja_JP/orders.lang
htdocs/langs/ja_JP/oscommerce.lang
htdocs/langs/ja_JP/other.lang
htdocs/langs/ja_JP/paybox.lang
htdocs/langs/ja_JP/paypal.lang
htdocs/langs/ja_JP/products.lang
htdocs/langs/ja_JP/projects.lang
htdocs/langs/ja_JP/propal.lang
htdocs/langs/ja_JP/sendings.lang
htdocs/langs/ja_JP/shop.lang
htdocs/langs/ja_JP/sms.lang
htdocs/langs/ja_JP/stocks.lang
htdocs/langs/ja_JP/suppliers.lang
htdocs/langs/ja_JP/trips.lang
htdocs/langs/ja_JP/users.lang
htdocs/langs/ja_JP/withdrawals.lang
htdocs/langs/ja_JP/workflow.lang
htdocs/langs/nb_NO/agenda.lang
htdocs/langs/nb_NO/banks.lang
htdocs/langs/nb_NO/bookmarks.lang
htdocs/langs/nb_NO/boxes.lang
htdocs/langs/nb_NO/cashdesk.lang
htdocs/langs/nb_NO/categories.lang
htdocs/langs/nb_NO/commercial.lang
htdocs/langs/nb_NO/companies.lang
htdocs/langs/nb_NO/compta.lang
htdocs/langs/nb_NO/contracts.lang
htdocs/langs/nb_NO/deliveries.lang
htdocs/langs/nb_NO/dict.lang
htdocs/langs/nb_NO/donations.lang
htdocs/langs/nb_NO/errors.lang
htdocs/langs/nb_NO/exports.lang
htdocs/langs/nb_NO/externalsite.lang
htdocs/langs/nb_NO/ftp.lang
htdocs/langs/nb_NO/help.lang
htdocs/langs/nb_NO/install.lang
htdocs/langs/nb_NO/interventions.lang
htdocs/langs/nb_NO/languages.lang
htdocs/langs/nb_NO/ldap.lang
htdocs/langs/nb_NO/mails.lang
htdocs/langs/nb_NO/main.lang
htdocs/langs/nb_NO/members.lang
htdocs/langs/nb_NO/orders.lang
htdocs/langs/nb_NO/paybox.lang
htdocs/langs/nb_NO/paypal.lang
htdocs/langs/nb_NO/projects.lang
htdocs/langs/nb_NO/propal.lang
htdocs/langs/nb_NO/sendings.lang
htdocs/langs/nb_NO/sms.lang
htdocs/langs/nb_NO/stocks.lang
htdocs/langs/nb_NO/suppliers.lang
htdocs/langs/nb_NO/trips.lang
htdocs/langs/nb_NO/users.lang
htdocs/langs/nb_NO/withdrawals.lang
htdocs/langs/nb_NO/workflow.lang
htdocs/langs/nl_NL/propal.lang
htdocs/langs/nl_NL/workflow.lang
htdocs/langs/pl_PL/agenda.lang
htdocs/langs/pl_PL/banks.lang
htdocs/langs/pl_PL/bookmarks.lang
htdocs/langs/pl_PL/boxes.lang
htdocs/langs/pl_PL/cashdesk.lang
htdocs/langs/pl_PL/categories.lang
htdocs/langs/pl_PL/commercial.lang
htdocs/langs/pl_PL/companies.lang
htdocs/langs/pl_PL/compta.lang
htdocs/langs/pl_PL/contracts.lang
htdocs/langs/pl_PL/deliveries.lang
htdocs/langs/pl_PL/dict.lang
htdocs/langs/pl_PL/donations.lang
htdocs/langs/pl_PL/errors.lang
htdocs/langs/pl_PL/exports.lang
htdocs/langs/pl_PL/externalsite.lang
htdocs/langs/pl_PL/ftp.lang
htdocs/langs/pl_PL/install.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pl_PL/languages.lang
htdocs/langs/pl_PL/mails.lang
htdocs/langs/pl_PL/members.lang
htdocs/langs/pl_PL/orders.lang
htdocs/langs/pl_PL/other.lang
htdocs/langs/pl_PL/paybox.lang
htdocs/langs/pl_PL/paypal.lang
htdocs/langs/pl_PL/projects.lang
htdocs/langs/pl_PL/propal.lang
htdocs/langs/pl_PL/sendings.lang
htdocs/langs/pl_PL/sms.lang
htdocs/langs/pl_PL/stocks.lang
htdocs/langs/pl_PL/suppliers.lang
htdocs/langs/pl_PL/trips.lang
htdocs/langs/pl_PL/users.lang
htdocs/langs/pl_PL/withdrawals.lang
htdocs/langs/pl_PL/workflow.lang
htdocs/langs/pt_PT/cashdesk.lang
htdocs/langs/ro_RO/agenda.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bookmarks.lang
htdocs/langs/ro_RO/boxes.lang
htdocs/langs/ro_RO/cashdesk.lang
htdocs/langs/ro_RO/commercial.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/contracts.lang
htdocs/langs/ro_RO/deliveries.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/donations.lang
htdocs/langs/ro_RO/errors.lang
htdocs/langs/ro_RO/exports.lang
htdocs/langs/ro_RO/externalsite.lang
htdocs/langs/ro_RO/interventions.lang
htdocs/langs/ro_RO/languages.lang
htdocs/langs/ro_RO/mails.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/members.lang
htdocs/langs/ro_RO/orders.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/paybox.lang
htdocs/langs/ro_RO/paypal.lang
htdocs/langs/ro_RO/projects.lang
htdocs/langs/ro_RO/propal.lang
htdocs/langs/ro_RO/sendings.lang
htdocs/langs/ro_RO/sms.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/trips.lang
htdocs/langs/ro_RO/users.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/ro_RO/workflow.lang
htdocs/langs/ru_RU/agenda.lang
htdocs/langs/ru_RU/bills.lang
htdocs/langs/ru_RU/bookmarks.lang
htdocs/langs/ru_RU/boxes.lang
htdocs/langs/ru_RU/companies.lang
htdocs/langs/ru_RU/compta.lang
htdocs/langs/ru_RU/contracts.lang
htdocs/langs/ru_RU/errors.lang
htdocs/langs/ru_RU/exports.lang
htdocs/langs/ru_RU/externalsite.lang
htdocs/langs/ru_RU/install.lang
htdocs/langs/ru_RU/mails.lang
htdocs/langs/ru_RU/main.lang
htdocs/langs/ru_RU/members.lang
htdocs/langs/ru_RU/orders.lang
htdocs/langs/ru_RU/paybox.lang
htdocs/langs/ru_RU/paypal.lang
htdocs/langs/ru_RU/propal.lang
htdocs/langs/ru_RU/stocks.lang
htdocs/langs/ru_UA/main.lang
htdocs/langs/sl_SI/agenda.lang
htdocs/langs/sl_SI/boxes.lang
htdocs/langs/sl_SI/cashdesk.lang
htdocs/langs/sl_SI/companies.lang
htdocs/langs/sl_SI/compta.lang
htdocs/langs/sl_SI/contracts.lang
htdocs/langs/sl_SI/dict.lang
htdocs/langs/sl_SI/errors.lang
htdocs/langs/sl_SI/exports.lang
htdocs/langs/sl_SI/externalsite.lang
htdocs/langs/sl_SI/install.lang
htdocs/langs/sl_SI/languages.lang
htdocs/langs/sl_SI/mails.lang
htdocs/langs/sl_SI/main.lang
htdocs/langs/sl_SI/members.lang
htdocs/langs/sl_SI/orders.lang
htdocs/langs/sl_SI/paybox.lang
htdocs/langs/sl_SI/paypal.lang
htdocs/langs/sl_SI/propal.lang
htdocs/langs/sl_SI/sendings.lang
htdocs/langs/sl_SI/stocks.lang
htdocs/langs/sl_SI/suppliers.lang
htdocs/langs/sv_SE/admin.lang
htdocs/langs/sv_SE/agenda.lang
htdocs/langs/sv_SE/banks.lang
htdocs/langs/sv_SE/bookmarks.lang
htdocs/langs/sv_SE/boxes.lang
htdocs/langs/sv_SE/cashdesk.lang
htdocs/langs/sv_SE/categories.lang
htdocs/langs/sv_SE/commercial.lang
htdocs/langs/sv_SE/companies.lang
htdocs/langs/sv_SE/compta.lang
htdocs/langs/sv_SE/contracts.lang
htdocs/langs/sv_SE/deliveries.lang
htdocs/langs/sv_SE/dict.lang
htdocs/langs/sv_SE/donations.lang
htdocs/langs/sv_SE/ecm.lang
htdocs/langs/sv_SE/errors.lang
htdocs/langs/sv_SE/exports.lang
htdocs/langs/sv_SE/externalsite.lang
htdocs/langs/sv_SE/ftp.lang
htdocs/langs/sv_SE/help.lang
htdocs/langs/sv_SE/install.lang
htdocs/langs/sv_SE/interventions.lang
htdocs/langs/sv_SE/languages.lang
htdocs/langs/sv_SE/ldap.lang
htdocs/langs/sv_SE/mails.lang
htdocs/langs/sv_SE/main.lang
htdocs/langs/sv_SE/members.lang
htdocs/langs/sv_SE/orders.lang
htdocs/langs/sv_SE/oscommerce.lang
htdocs/langs/sv_SE/other.lang
htdocs/langs/sv_SE/paybox.lang
htdocs/langs/sv_SE/paypal.lang
htdocs/langs/sv_SE/products.lang
htdocs/langs/sv_SE/projects.lang
htdocs/langs/sv_SE/propal.lang
htdocs/langs/sv_SE/sendings.lang
htdocs/langs/sv_SE/shop.lang
htdocs/langs/sv_SE/sms.lang
htdocs/langs/sv_SE/stocks.lang
htdocs/langs/sv_SE/suppliers.lang
htdocs/langs/sv_SE/trips.lang
htdocs/langs/sv_SE/users.lang
htdocs/langs/sv_SE/withdrawals.lang
htdocs/langs/sv_SE/workflow.lang
htdocs/langs/tr_TR/donations.lang
htdocs/langs/tr_TR/ldap.lang
htdocs/langs/tr_TR/oscommerce.lang
htdocs/langs/tr_TR/paybox.lang
htdocs/langs/tr_TR/paypal.lang
htdocs/langs/tr_TR/shop.lang
htdocs/langs/tr_TR/trips.lang
htdocs/langs/zh_CN/agenda.lang
htdocs/langs/zh_CN/banks.lang
htdocs/langs/zh_CN/bookmarks.lang
htdocs/langs/zh_CN/boxes.lang
htdocs/langs/zh_CN/cashdesk.lang
htdocs/langs/zh_CN/commercial.lang
htdocs/langs/zh_CN/companies.lang
htdocs/langs/zh_CN/compta.lang
htdocs/langs/zh_CN/contracts.lang
htdocs/langs/zh_CN/deliveries.lang
htdocs/langs/zh_CN/dict.lang
htdocs/langs/zh_CN/donations.lang
htdocs/langs/zh_CN/ecm.lang
htdocs/langs/zh_CN/errors.lang
htdocs/langs/zh_CN/exports.lang
htdocs/langs/zh_CN/externalsite.lang
htdocs/langs/zh_CN/ftp.lang
htdocs/langs/zh_CN/install.lang
htdocs/langs/zh_CN/interventions.lang
htdocs/langs/zh_CN/languages.lang
htdocs/langs/zh_CN/mails.lang
htdocs/langs/zh_CN/main.lang
htdocs/langs/zh_CN/members.lang
htdocs/langs/zh_CN/orders.lang
htdocs/langs/zh_CN/oscommerce.lang
htdocs/langs/zh_CN/paybox.lang
htdocs/langs/zh_CN/paypal.lang
htdocs/langs/zh_CN/projects.lang
htdocs/langs/zh_CN/propal.lang
htdocs/langs/zh_CN/sendings.lang
htdocs/langs/zh_CN/shop.lang
htdocs/langs/zh_CN/sms.lang
htdocs/langs/zh_CN/stocks.lang
htdocs/langs/zh_CN/suppliers.lang
htdocs/langs/zh_CN/trips.lang
htdocs/langs/zh_CN/users.lang
htdocs/langs/zh_CN/withdrawals.lang
htdocs/langs/zh_CN/workflow.lang
htdocs/langs/zh_TW/banks.lang
htdocs/langs/zh_TW/bookmarks.lang
htdocs/langs/zh_TW/boxes.lang
htdocs/langs/zh_TW/cashdesk.lang
htdocs/langs/zh_TW/deliveries.lang
htdocs/langs/zh_TW/ecm.lang
htdocs/langs/zh_TW/externalsite.lang
htdocs/langs/zh_TW/oscommerce.lang
htdocs/langs/zh_TW/paypal.lang
htdocs/langs/zh_TW/shop.lang
htdocs/langs/zh_TW/sms.lang
htdocs/langs/zh_TW/trips.lang
htdocs/langs/zh_TW/withdrawals.lang
htdocs/langs/zh_TW/workflow.lang
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/members/sync_members_ldap2dolibarr.php
2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Florian Henry
0ce833d282
Fix bug export contact extrafields
2013-07-24 15:19:05 +02:00
Laurent Destailleur
7cf429d238
Fix: Color change on page break.
2013-07-24 15:04:09 +02:00
Florian Henry
f11d477770
Fix bug export contact extrafields
2013-07-24 13:28:02 +02:00
BENKE Charles
34c09c3aa5
Update pdf_blochet.class.php
...
add ref_ext on pdf output if not empty
2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24
Merge pull request #1127 from csalvador/taskpdffix
...
fix pdf model import
2013-07-24 01:30:55 -07:00
Cédric Salvador
35faff04e9
fix pdf model import
2013-07-23 15:59:41 +02:00
BENKE Charles
8c7c3f03d3
Update modBanque.class.php
...
Add bordereau ref_ext fields on export
2013-07-23 05:54:47 +02:00
Juanjo Menent
d7da816258
Merge pull request #1114 from defrance69/patch-5
...
Update modBanque.class.php
2013-07-22 00:05:46 -07:00
BENKE Charles
c555c17315
Update modBanque.class.php
...
Add Export of check deposit / bill
2013-07-20 23:47:37 +02:00
Geoffrey
27e26c872e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
7c24686532
Add good vars for odt generation
2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c
Fix: Restore error message, but only when required.
2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65
Fix: syntax error
2013-07-19 17:18:44 +02:00
Raphaël Doursenaud
e119a5c650
Avoid printing errors on documents that are fine without
2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Laurent Destailleur
22f57e3350
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-18 19:02:02 +02:00
Laurent Destailleur
75214a6b70
New: Add graphical box for turnover and proposal
2013-07-18 16:53:31 +02:00
Florian Henry
9d942017ee
Merge remote-tracking branch 'origin/develop' into develop_T165
2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310
[ task #165 ] Add export of multiprices
2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532
[ task #924 ] Add numbering rule on task
...
[ task #925 ] Add ODT document generation for Tasks in project module
2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292
On going sync/merge from other repo
2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf
Start functionnality
2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5
Merge pull request #1096 from FHenry/develop_categorycontact
...
Develop categorycontact
2013-07-17 08:41:02 -07:00
Florian Henry
4fee61beb0
Fix adding email into mailing module
...
source_id is already added
2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17
[ task #519 ] Add category association with contacts
2013-07-16 21:04:58 +02:00
Laurent Destailleur
f564d1912e
New: Add graph for supplier invoices.
...
Fix: Error management into supplier invoice validation.
2013-07-16 18:43:38 +02:00
Laurent Destailleur
dd10ff8a11
eol
2013-07-15 18:51:56 +02:00
Laurent Destailleur
9c9b81c981
Merge pull request #1092 from atm-maxime/mko862
...
Task 862 : ODT on shipment
2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-14 16:35:02 +02:00
Maxime Kohlhaas
9e5286bce9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-07-14 13:27:41 +02:00
Laurent Destailleur
3a9ffb19c3
fix: eol
2013-07-13 21:14:05 +02:00
Maxime Kohlhaas
3c7f4a3548
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 15:55:33 +02:00
Laurent Destailleur
807cbe4163
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-11 09:43:07 +02:00
Maxime Kohlhaas
9d931b7b05
Task # 862 : ODT templates on shipment
2013-07-10 15:54:28 +02:00
BENKE Charles
45e32ca3a5
Update modFacture.class.php
...
add 'accountancy_code_sell' to the customer invoice export list
2013-07-05 12:14:27 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea
New: Add box for graph of customer orders
2013-06-30 23:01:28 +02:00
Laurent Destailleur
314d45a9ee
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/el_GR/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/it_IT/admin.lang
htdocs/langs/nb_NO/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/pt_BR/admin.lang
htdocs/langs/pt_PT/admin.lang
htdocs/langs/sl_SI/admin.lang
htdocs/langs/zh_TW/admin.lang
2013-06-28 00:52:09 +02:00
Laurent Destailleur
dc22b5a50a
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/modules/mailings/modules_mailings.php
2013-06-28 00:24:13 +02:00
Florian Henry
469e700895
Fix bug pgsql : add mail directly into mailling
2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84
Fix : bad element type name for company extrafields into export
2013-06-27 14:30:49 +02:00
Laurent Destailleur
696ad07871
LF
2013-06-26 16:45:42 +02:00
Laurent Destailleur
af4651f1a2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
285ea8da3f
More info into log
2013-06-25 15:47:59 +02:00
Laurent Destailleur
a8547b5375
New: Add property hidden into module descriptor to allow to hide a
...
module according to some dynamic conditions.
2013-06-24 18:31:56 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
ec2e3db450
New: Switch cron module to status stable. Thanks to everybody to test
...
this new module and debug it.
2013-06-23 22:21:21 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
3cd303c944
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-06-14 19:56:07 +02:00
Laurent Destailleur
3b88142ba8
Fix: Import of extra field for members
2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850
Fix: Export of extra field for members
2013-06-14 02:35:30 +02:00
Laurent Destailleur
b3ca9de399
Fix: Update select with list
2013-06-14 02:09:34 +02:00
Laurent Destailleur
a50cd7b698
Fix bug into script that fix CRLF into LF
2013-06-12 11:59:55 +02:00
Laurent Destailleur
0b35217481
Start to debug/fix module IPP
2013-06-12 11:35:30 +02:00
Laurent Destailleur
0c9bc2ac5f
Merge branch 'develop' of https://github.com/frederic34/dolibarr into
...
frederic34-develop
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2013-06-12 10:47:56 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.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/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Laurent Destailleur
5a77828e62
New: Add object_hour as substitution tag for opendocument generation.
2013-06-08 18:12:32 +02:00
Laurent Destailleur
bd4ca9f1ed
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374
Fix: Param lang forbidden into price function
2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
eac4aa7e28
New: Module mailman can subscribe/unsubscribe to ML according to
...
categories of member.
2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
c6c4a83850
Fix: Removed deprecated code fo local tax type 7 since we can use now
...
the fiscal stamp that is a better implementation.
2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de
Fix: First permission must start with 1
2013-06-03 23:06:15 +02:00
Laurent Destailleur
c1dd2f20cd
Qual: Clean code.
2013-06-03 15:18:36 +02:00
Laurent Destailleur
da73a8d84c
Fix: syntax error
...
Fix: Bad field param
2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e
Fix: Bad param used
2013-05-31 16:35:32 +02:00
Laurent Destailleur
0ec32afd8d
Fix: syntax error
...
Fix: Bad field param
2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844
Fix: Bad param used
2013-05-31 13:21:01 +02:00
simnandez
7fa0d6cffa
Fix: [ bug #916 ] Same for Thirds and Members
2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f
Fix: [ bug #916 ] Same for Thirds and Members
2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
simnandez
4f9b5883df
Fix: [ bug #916 ] Products complementary attributes, imports and
...
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports
No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:18:24 +02:00
simnandez
00395c87a8
Fix: [ bug #916 ] Products complementary attributes, imports and
...
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports
No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:17:39 +02:00
Laurent Destailleur
b2600e8880
Fix: Missing trans
2013-05-29 02:20:30 +02:00
BENKE Charles
aa06a0b113
Update modSociete.class.php
...
enhance filter on export of contact
add postorfunction field in export of contact
2013-05-28 15:37:08 +02:00
BENKE Charles
ed67173734
Update modFournisseur.class.php
...
Add filter feature on the commande export
2013-05-24 16:17:36 +02:00
Laurent Destailleur
ee84457104
Fix: not defined default value
2013-05-23 10:04:35 +02:00
Laurent Destailleur
12681994ea
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00
Christophe Battarel
f8ca842685
fix typo error
2013-05-20 10:10:34 +02:00
Christophe Battarel
347fc6d714
fix unauthorized access to margins for external user
2013-05-19 14:04:21 +02:00
Maxime Kohlhaas
57212d7db8
Add mobile phone in contact export
2013-05-17 17:29:41 +02:00
fhenry
faa2399b80
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
2013-05-17 09:49:06 +02:00
Laurent Destailleur
b17fe9fc00
New: Export support now autosize of column for excel export.
...
Fix: Bad charset when using script export-bank-receipts.
2013-05-15 13:37:31 +02:00
Laurent Destailleur
f6dfcb756c
Text cells must be left align into excel 2007 export.
2013-05-14 23:54:22 +02:00
fhenry
d0b4cef7a4
Change duration _planned by planned_workload
2013-05-14 20:22:33 +02:00
fhenry
f98442d700
Remove the option into admin screen
2013-05-14 09:24:05 +02:00
fhenry
aa7e3c2fdd
[ task #892 ] Add option in thridparty customer/supplier admin to hide
...
non active in select_company method
2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
Regis Houssin
8836b30a02
Fix: missing rename note to note_private and add note_public
2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4
Fix: missing rename note to note_private and add note_public
2013-05-07 14:26:11 +02:00
Laurent Destailleur
8a82c8c5d5
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/margin/agentMargins.php
htdocs/margin/tabs/productMargins.php
2013-05-07 13:08:30 +02:00
simnandez
15ede98fe7
New: [ task #877 ] Reorganize menus. Init works
...
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
fhenry
95e4474906
Fix bug on PgSQL if user in on another entity than 1
2013-05-03 20:56:58 +02:00
Laurent Destailleur
880daa4375
Fix: log file permission during install
2013-05-03 11:51:26 +02:00
Laurent Destailleur
c17cd04686
Merge pull request #904 from defrance69/patch-5
...
Update modSociete.class.php
2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6
Merge pull request #903 from defrance69/patch-4
...
Update modProduct.class.php
2013-05-03 01:09:29 -07:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
Laurent Destailleur
5c95018356
Fix: Avoid empty arrays
2013-05-01 16:00:06 +02:00
Laurent Destailleur
0a71c84bf4
Fix: Remove separator files.
2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227
Fix: Import of contact/address not complete and not working with pgsql
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883
Fix: Import of contact/address not complete and not working with pgsql
2013-04-30 19:02:02 +02:00
BENKE Charles
b1784ff247
Update modSociete.class.php
...
add filter feature on extrafields
2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0
Update modProduct.class.php
...
Add filtering feature on extrafields
2013-04-30 13:12:54 +03:00
Grand Philippe
c4a064d104
fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired
2013-04-28 19:35:10 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Marcos García
36574771a6
Translation of barcode internal engine string
2013-04-27 12:49:19 +02:00
Laurent Destailleur
0a282c018a
Merge pull request #886 from jfefe/doc_ods
...
Using of MAIN_DOC_USE_TIMING on ODT
2013-04-26 13:04:08 -07:00
Laurent Destailleur
162cb4ffea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0
Fix: Removed warnings
2013-04-26 19:13:39 +02:00
jfefe
8835868749
Implement MAIN_DOC_USE_TIMING into project and order ODT
2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3
Use MAIN_DOC_USE_TIMING on invoices (odt)
2013-04-26 08:48:44 +02:00
jfefe
036e81a089
Use MAIN_DOC_USE_TIMING on proposals (ODT)
2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f
Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING)
2013-04-26 08:48:43 +02:00
Laurent Destailleur
271dcf578f
Fix: Better error message during import of csv with records split onto
...
several lines.
2013-04-25 23:49:24 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
simnandez
436b6259c0
Fix: finish merge
2013-04-24 16:57:46 +02:00
fhenry
41c8a9aa6a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f
Fix: finish merge
2013-04-24 12:44:36 +02:00
fhenry
bd1b440743
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d
Qual: Clean code of box management
2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/launchpad/README
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/core/modules/syslog/mod_syslog_file.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
2013-04-23 14:04:56 +02:00
Laurent Destailleur
3f1f065d4e
Fix: log must use the mask defined into setup
...
Conflicts:
htdocs/core/modules/syslog/mod_syslog_file.php
2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2
Fix: log must use the mask defined into setup
2013-04-23 12:00:02 +02:00
Laurent Destailleur
c8b2ce3d8e
Removed warning
2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18
Removed warning
2013-04-22 20:45:47 +02:00
fhenry
3fdc57cc56
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e
Better management for ODT to PDF
2013-04-22 15:50:26 +02:00
Regis Houssin
ab4a3dcaa7
Fix: missing rename field
2013-04-22 10:18:03 +02:00
JF FERRY
642ba10d84
New hidden option to introduce timing value into odt document nam
2013-04-21 17:04:54 +02:00
JF FERRY
83028b958a
Task #838 : retieve extension to work with ods document
2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20
Task #838 - change regex to look at ods document too
2013-04-21 14:55:32 +02:00
Laurent Destailleur
a7f169d102
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6
Fix: pgsql compatibility
2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246
Merge pull request #851 from FHenry/develop
...
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
2013-04-20 12:02:16 -07:00
Maxime Kohlhaas
cf945f0187
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if
...
libreoffice/jodconverter/exec shell right)
2013-04-20 10:44:01 +02:00
Maxime Kohlhaas
bfb05c78cd
Change carrier config into dict instead of dedicated conf page
2013-04-19 20:20:10 +02:00
Laurent Destailleur
08ae1d289b
Pgsql compatibility
2013-04-19 15:02:53 +02:00
Laurent Destailleur
df0b0ebf51
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
2013-04-19 09:44:37 +02:00
Juanjo Menent
fa4490ef79
Merge pull request #840 from FHenry/develop
...
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481
Qual: No need to use two menu entries for this.
2013-04-17 16:26:14 +02:00
fhenry
4927aae891
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 16:20:01 +02:00
Laurent Destailleur
de2ddc02e4
Qual: Another clean of menu management system. Removed all files
...
pre.inc.php
2013-04-15 13:11:29 +02:00
Juanjo Menent
de19af9e9f
Merge pull request #825 from FHenry/develop
...
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-14 05:15:17 -07:00
Laurent Destailleur
3cec5bfc40
doxygen
2013-04-14 11:22:00 +02:00
fhenry
00fb40e073
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/es_ES/admin.lang
Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
2013-04-14 09:40:01 +02:00
Laurent Destailleur
e5a945ba5b
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/admin/propal.php
htdocs/compta/journal/purchasesjournal.php
htdocs/compta/journal/sellsjournal.php
htdocs/core/class/conf.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/core/modules/mailings/contacts2.modules.php
htdocs/langs/ca_ES/admin.lang
htdocs/langs/en_US/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
6e495bfbe1
Fix: lang loading
2013-04-13 14:38:26 +02:00
fhenry
cc497490eb
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-12 11:09:53 +02:00
Laurent Destailleur
8e3f0172fc
Fix: Fix tons of pb with num ref system of supplier invoices.
2013-04-12 00:00:31 +02:00
fhenry
629ef78dc8
Add subtitution inside header and fotter document
2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2
Add hook for substitution
2013-04-11 17:31:24 +02:00
fhenry
6335918d72
Quel : indentation
2013-04-11 17:06:53 +02:00
fhenry
2440513007
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/opensurvey/fonctions.php
htdocs/opensurvey/public/choix_date.php
htdocs/opensurvey/public/create_survey.php
htdocs/opensurvey/public/exportcsv.php
htdocs/public/paybox/paymentko.php
Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
2013-04-11 10:04:27 +02:00
Laurent Destailleur
792341a4b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
2013-04-11 07:39:16 +02:00
fhenry
98ddd02a32
Qual : PHP Code_Sniffer
2013-04-10 19:55:21 +02:00
Laurent Destailleur
a32a02e4c1
Fix: Removed warnings
2013-04-10 16:51:13 +02:00
Laurent Destailleur
d7c0cf3d50
Fix: More complete fix for emailing contact selectors.
2013-04-10 16:29:53 +02:00
Regis Houssin
19e902ef8f
Fix: filter on all contacts, not just those related to a company
2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656
Fix: filter on all contacts, not just those related to a company
2013-04-10 15:59:54 +02:00
Regis Houssin
8118332dfb
Fix: security
...
Conflicts:
htdocs/core/modules/mailings/contacts2.modules.php
2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2
Fix: Codesniffer
2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88
Fix: security
2013-04-10 11:56:19 +02:00
Laurent Destailleur
538194f435
New: Add module opensurvey. Final. Test are welcome.
2013-04-09 23:05:50 +02:00
frederic34
61b4305949
Merge remote-tracking branch 'upstream/develop' into develop
2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
fhenry
6379b74099
Fix bug on ODT template path for order and projects
2013-04-08 18:02:12 +02:00
frederic34
40f11206de
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/commande/fiche.php
2013-04-08 11:33:45 +02:00
Marcos García
6252857440
Fixed translations and BILL_SUPPLIER_BUILDDOC trigger
2013-04-06 17:56:10 +02:00
fhenry
2b0668bf81
Add paiement mode et delay on PDF muscadet
2013-04-06 13:38:32 +02:00
fhenry
9ff559b033
Add wished delivery date into supplier orders PDF muscadet
2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05
Fix order_supplier and invoice_supplier PDF model name
2013-04-06 13:00:41 +02:00
fhenry
cc465380da
Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry)
2013-04-06 12:20:19 +02:00
Laurent Destailleur
1cf2276584
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/prospect/list.php
2013-04-05 22:59:06 +02:00
fhenry
81b34f9918
Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page
...
mail
2013-04-05 09:23:31 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Stephen L
cb3f183353
Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2013-04-03 00:57:40 +02:00
Laurent Destailleur
4c1f17f42f
Qual: More robust error management for menu description
2013-03-30 19:11:52 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
97a90b0904
New: Add more ODT tags
2013-03-29 16:45:40 +01:00
Laurent Destailleur
4c47393b51
Fix: Add more ODT tags
2013-03-29 16:18:55 +01:00
Laurent Destailleur
2e3fd0083a
Merge pull request #785 from FHenry/develop
...
Add more information in ODT project template
2013-03-28 15:40:46 -07:00
fhenry
c2be118efd
Add more information in ODT project template
2013-03-28 20:51:00 +01:00
Laurent Destailleur
07062065e5
Merge pull request #782 from jfefe/propal_odt_choice
...
New : can choose to generate the ODT document according to the status of a propale
2013-03-27 13:35:34 -07:00
jfefe
1f537300ea
Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status
2013-03-27 19:11:42 +01:00
jfefe
ee52e1a487
Merge remote-tracking branch 'upstream/develop' into propal_odt_choice
2013-03-27 15:25:13 +01:00
fhenry
9507f4258b
Add inforamtion on Project into ODT project
2013-03-26 23:32:22 +01:00
frederic34
1cd39df82b
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1
Print IPP
2013-03-26 10:23:00 +01:00
Laurent Destailleur
55a9d3abf1
Merge pull request #776 from FHenry/develop
...
[ task #770 ] Add ODT document generation for Projects module
2013-03-25 15:52:30 -07:00
fhenry
9dd4ed9cb8
[ task #770 ] Add ODT document generation for Projects module
2013-03-25 19:28:34 +01:00
BENKE Charles
8b160ac712
Update modAgenda.class.php
...
Add export feature of calendar module
2013-03-25 18:26:35 +01:00
Laurent Destailleur
ff2407a454
Add hidden option to setup font size of information.
2013-03-24 14:01:33 +01:00
Laurent Destailleur
c3589e9785
Some debug into cron module:
...
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Laurent Destailleur
9fe0d2cdd2
Fix: Removed a lors 'pre'. Also accurency of data must not be overwrite
...
by odt template engine (to be compatible with all countries precision).
2013-03-23 18:22:25 +01:00
Laurent Destailleur
73de8d169f
Fix: Avoid call method on non object error
2013-03-23 18:04:46 +01:00
Laurent Destailleur
fbf8d410d2
New: Support revenue stamp onto invoices
2013-03-23 17:34:23 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
bf912e2c78
Fix: Some bug into supplier pdf invoice setup.
2013-03-19 15:19:31 +01:00
Christophe Battarel
e2f28b6c51
remove experimental commissions module
2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3
Merge pull request #752 from FHenry/develop
...
task #768 & task #769
2013-03-18 05:02:38 -07:00
Laurent Destailleur
c6b4259735
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96
New: Work on cron module
2013-03-17 19:39:53 +01:00
Grand Philippe
29b8ce1c2d
try to fix: supplier invoice numbering
2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9
normalize
2013-03-17 14:40:49 +01:00
Grand Philippe
57d20e28fb
normalize and simplify code
2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531
normalize
2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe
try to fix : cannot display numbering models
2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.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/exports/class/export.class.php
2013-03-16 17:07:35 +01:00
Grand Philippe
86dff79b73
try to fix : cannot display numbering models
2013-03-16 16:58:45 +01:00
Grand Philippe
7a69066dc8
enhancement of suppliers module
2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-16 10:35:12 +01:00
fhenry
98cc7b7a2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-16 09:43:57 +01:00
fhenry
e71103ed02
task #768 :
...
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
2013-03-16 09:23:34 +01:00
jfefe
65a9edd5a7
Fix : lang
2013-03-16 01:52:56 +01:00
jfefe
5f1141675c
Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not.
2013-03-16 01:10:21 +01:00
Grand Philippe
7dbc782d42
prepair numbering models for supplier invoices
2013-03-15 19:03:07 +01:00
Grand Philippe
e46900ad84
prepair numbering models for supplier invoices
2013-03-15 18:40:31 +01:00
Grand Philippe
8f7c629d9c
prepair numbering models for supplier invoices
2013-03-15 17:45:25 +01:00
Laurent Destailleur
7a152c8e0b
Prepare code to be compatible when we will store localtax_type into
...
lines.
2013-03-15 17:29:18 +01:00
Laurent Destailleur
f522b18bdc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-15 17:14:06 +01:00
Laurent Destailleur
2ab28d974f
Fix: Use better test to show localtax to avoid problem when switching
...
from different country.
Perf: Can return all localtaxes in one call.
2013-03-15 17:10:18 +01:00
Laurent Destailleur
1a62cdfbe8
Fix: Use better test to show localtax to avoid problem when switching
...
from different country.
2013-03-15 17:06:42 +01:00
Grand Philippe
a9eed57e27
prepair numbering models for supplier invoices
2013-03-15 16:43:28 +01:00
Grand Philippe
b0bce23595
prepair numbering models for supplier invoices
2013-03-15 16:16:38 +01:00
Grand Philippe
3c7c5f262f
anglicization of comments
2013-03-15 16:03:03 +01:00
Grand Philippe
e1baf806b9
change birth instead of naiss
2013-03-13 22:17:03 +01:00
Laurent Destailleur
277784af25
New: Start to work on a cron module
2013-03-13 19:55:21 +01:00
Laurent Destailleur
b0d7b33815
Merge pull request #715 from jfefe/extrafields
...
[ task #746 ] add extrafields support on propal object
2013-03-11 08:44:59 -07:00
Laurent Destailleur
633a15f10d
Fix: Usage of order into export broken when filters are used
2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43
Fix: Usage of order into export broken when filters are used
2013-03-11 14:09:54 +01:00
jfefe
ba8525bd6a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
...
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a
Fix: PHPUnit tests are back.
2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865
Merge pull request #724 from KreizIT/develop
...
Add trigger BILL_UNVALIDATE when invoice is unvalidate
2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856
Add trigger BILL_UNVALIDATE when invoice is unvalidate
2013-03-09 17:38:35 +01:00
Laurent Destailleur
00f4e6ad85
Fix: Force format text of excel text fields
2013-03-09 16:58:55 +01:00
Laurent Destailleur
418eeef8b4
Fix: Ton of bugs into renaming fields
2013-03-09 16:19:15 +01:00
frederic34
16c5427366
Print IPP
2013-03-08 11:26:05 +01:00
Laurent Destailleur
c86f3ef4b4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/commande/fiche.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-03-08 01:57:32 +01:00
Laurent Destailleur
e97ca67c4a
Fix: Several problem with localtax into PDF generation
...
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
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1
Fix: Several problem with localtax into PDF generation
2013-03-07 12:04:12 +01:00
jfefe
fcd81e47eb
Use price2num() function instead of price() to use calcul in ODT.
...
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
2013-03-07 03:43:23 +01:00
jfefe
289e2e7888
New function to fill ODT substitution array with extrafield of object
2013-03-07 03:27:28 +01:00
jfefe
1690c77aa2
Merge branch 'extra_invoice' into extrafields
...
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-07 01:48:27 +01:00
eldy
6c2841d4d6
New: Type of fields are received by export format handlers
2013-03-06 22:28:15 +01:00
eldy
e74b07cbff
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-06 21:28:50 +01:00
jfefe
04617d0eb3
Show extrafields for object into invoice ODT document
2013-03-06 05:33:00 +01:00
jfefe
7d3c35fb90
Merge branch 'extra_propal' into extrafields
2013-03-06 01:41:47 +01:00
Laurent Destailleur
c37e873ab4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
2013-03-05 18:32:01 +01:00
jfefe
5ce11d00dd
Display linked propal information into invoice ODT
2013-03-05 15:11:51 +01:00
JF FERRY
ff2a851ae8
Move substitution function for propal to common class & add extrafields display
2013-03-05 08:38:41 +01:00
Laurent Destailleur
b036120c70
Labels
2013-03-04 23:56:17 +01:00
fhenry
c29602382d
Taking account remark on pull request da17302
2013-03-04 16:59:39 +01:00
fhenry
da17302349
[ task #743 ] GED : Add aministration option to disabled autotree to
...
display
2013-03-04 11:16:46 +01:00
fhenry
b0212fc8e6
Fix [ bug #742 ]
...
and translation of constant description
2013-03-03 21:23:18 +01:00
Laurent Destailleur
7bbbda2dce
New: dol_syslog method accept a suffix to use different log files for
...
log.
2013-02-28 16:19:16 +01:00
Laurent Destailleur
bdcb6bdef5
Try to aplpy enhancements defined into
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
2013-02-26 20:15:20 +01:00
Grand Philippe
79c2e17cbb
english language standardization
2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082
english language standardization
2013-02-23 17:01:10 +01:00
Laurent Destailleur
4dbf5a20ad
Merge pull request #687 from frederic34/develop
...
WIP : Admin for Carriers
2013-02-23 07:38:55 -08:00
Grand Philippe
ac0e99bc1a
english language standardization
2013-02-23 16:21:49 +01:00
Grand Philippe
f862adc4d9
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-23 15:27:06 +01:00
frederic34
9333fdb97f
WIP : Admin for Carriers
2013-02-23 15:23:33 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8
Merge pull request #685 from frederic34/develop
...
WIP : Admin for Carriers
2013-02-23 03:11:52 -08:00
Grand Philippe
182fdbce32
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-23 10:04:31 +01:00
Grand Philippe
a0df6764d8
english standardization
2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2
english standardization
2013-02-22 17:11:53 +01:00
Laurent Destailleur
8c4e13230b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 14:20:46 +01:00
philippe
b4e43bbc41
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 13:58:19 +01:00
Regis Houssin
b5d2a378fa
Fix: pdf models are unstable and time consuming.
2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b
Fix: pdf models are unstable and time consuming.
2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 13:02:15 +01:00
Regis Houssin
8a5f68de9c
Fix: wrong hidden
2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e
Fix: wrong hidden
2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7
New: Prepare code to be able to choose bank account to show when
...
building pdf and payment mode is withdraw.
2013-02-22 12:04:38 +01:00
philippe
fae9f73ea4
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa
Fix: hide blocs with multi-page
2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87
Fix: hide blocs with multi-page
2013-02-22 11:25:29 +01:00
Grand Philippe
d229d3a594
english standardization
2013-02-22 09:41:56 +01:00
frederic34
de4bc7f39d
Fix : It was a bad idea to add COL in the code name of new carriers
2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520
New: Add some carrier
2013-02-21 11:23:12 +01:00
fhenry
3e42f90b1e
Better to use foreach because when add mail in $cible array we can test
...
with (!array_key_exists($obj->email, $cibles)) better than old method
2013-02-19 04:48:39 +01:00
Laurent Destailleur
2ea62073b6
Merge pull request #660 from grandoc/develop
...
fix : doesn't work with a /
2013-02-16 14:14:30 -08:00
Grand Philippe
2bfd6c40d0
fix trad : change adresse versus address
2013-02-15 19:26:09 +01:00
Grand Philippe
7c47dedbce
fix trad: begin change address instead of adresse
2013-02-15 17:33:07 +01:00
Laurent Destailleur
7260f39d21
New: Support tag total_vat_x.y for vat rate x.y into ODT templates
2013-02-15 17:06:32 +01:00
Laurent Destailleur
7d1c51ab77
Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
2013-02-13 16:45:53 +01:00
Laurent Destailleur
f4c4a43f57
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-28 17:31:17 +01:00
Laurent Destailleur
ac3ccade98
Fix: number of chars to low to show value.
2013-01-28 13:11:12 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
f650888ea6
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d
Fix: Bad error management
2013-01-18 12:09:39 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
6a51db82e9
Qual: We can enable box by default because a warning is output to user.
2013-01-15 15:53:35 +01:00
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
8ac33e98e7
Fix: property object_total_discount was not working when quantity was
...
not 1.
2013-01-10 12:58:46 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
5c51905f63
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3
Fix: Example an label of category import
2013-01-09 13:29:12 +01:00
Laurent Destailleur
f3df7a2fec
Fix: An easier to understand fix. Remove also not recommanded "continue
...
2" instructions.
2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c
Merge pull request #581 from simnandez/3.3
...
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
2013-01-08 13:38:38 -08:00
Laurent Destailleur
b7a5e226c9
Fix: Disable menu entry of a not avilable feature
2013-01-08 18:53:45 +01:00
Laurent Destailleur
ec3421d59e
New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR)
2013-01-08 13:45:52 +01:00
simnandez
596df78d39
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-08 08:46:48 +01:00
Laurent Destailleur
de83dc68e1
New: Uniformize odt generation to use hooks like pdf generation
2013-01-07 02:24:20 +01:00
Laurent Destailleur
753d79f181
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8
Fix: Normalize trigger names for fichinter module.
2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
717657dd05
Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO
2012-12-30 12:40:32 +01:00
Laurent Destailleur
5e05e0aa55
Fix: Trigger names
2012-12-29 17:34:52 +01:00
Laurent Destailleur
1667228d74
Fix: Normalize new trigger names.
2012-12-29 16:42:30 +01:00
Marcos García
354c00b9ca
CerfaFR donation template wasn't translating payment mode
2012-12-29 01:13:31 +01:00
Laurent Destailleur
e39ec132e5
Fix: Checkstyle
2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52
Fix: Solve phpunit regression.
...
Include an option to support local tax of type 7 (need more time to
validate this type).
2012-12-19 18:51:49 +01:00
Regis Houssin
65090c582d
Fix: checkstyle
2012-12-15 11:39:47 +01:00
Regis Houssin
b09a44701e
Fix: wrong EOL
2012-12-13 13:08:03 +01:00
Laurent Destailleur
57742b347a
Fix: Bad position of field with non A4 pages
2012-12-12 20:58:49 +01:00
Laurent Destailleur
77ca4241a5
New: Can input a payment back onto an credit note.
2012-12-09 18:39:42 +01:00
Laurent Destailleur
b119ab5539
Prepare 3.3 freeze.
2012-12-08 14:24:57 +01:00
Regis Houssin
3d4621327c
Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
...
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Laurent Destailleur
b0b0f06655
Fix: Removed useless code
2012-12-03 20:23:16 +01:00
Regis Houssin
4388be7295
FIXME $ident is not defined
2012-12-03 17:16:04 +01:00
Laurent Destailleur
7d8c0837b6
Restore another lost commit.
2012-12-02 19:45:35 +01:00
Laurent Destailleur
fd22705de4
New: Log handler can now manage indent on database transactions
2012-12-02 15:20:45 +01:00
Regis Houssin
00aa22e1d7
Fix: wrong EOL
2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18
function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model.
2012-12-02 10:52:53 +01:00
Christophe Battarel
785491ca2c
add function gettypeoflocaltax and modify pdf models
2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b
remove unused arrays into pdf models (localtaxes)
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a
show local taxes on crabe pdf model
2012-12-02 10:42:24 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Christophe Battarel
b70df3762c
Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop
2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832
resolve conflict
2012-11-30 10:57:42 +01:00
Christophe Battarel
51d87f8f4a
function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model.
2012-11-29 11:36:59 +01:00
Regis Houssin
d97f1937f8
Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!!
2012-11-29 10:25:33 +01:00
Laurent Destailleur
8212700c41
Fix: EOL
2012-11-28 19:25:12 +01:00
Laurent Destailleur
effe169850
Fix: pdf_getPDFFontSize must be after pdf_getInstance
2012-11-28 19:19:39 +01:00
Christophe Battarel
e459736977
add function gettypeoflocaltax and modify pdf models
2012-11-28 17:47:15 +01:00
Christophe Battarel
f0918a2536
remove unused arrays into pdf models (localtaxes)
2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4
show local taxes on crabe pdf model
2012-11-28 12:11:42 +01:00
Christophe Battarel
b9cdde88c7
show localtaxes on einstein pdf model
2012-11-28 10:43:21 +01:00
Christophe Battarel
f00b4b5527
correction to allow global local tax (type 7) on localtax1
2012-11-28 10:24:40 +01:00
Christophe Battarel
203a03c4d1
show local taxes on pdf propale azur model
2012-11-27 15:56:45 +01:00
Laurent Destailleur
59a305f6f1
New: no dash line if last item.
2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5
New: Add option to add slashes lines between lines into PDF.
2012-11-21 19:07:03 +01:00
Laurent Destailleur
d9cdb542d5
Debug filter during export
2012-11-20 14:07:52 +01:00
Regis Houssin
2d5368e135
Fix: converting line delimiters
2012-11-20 12:11:19 +01:00
Laurent Destailleur
6512fd90a9
New: Can export customer shipments.
2012-11-18 15:24:01 +01:00
Laurent Destailleur
2e8e1f759f
New: Add warning when we try to load sql from an not existing dir
2012-11-16 13:25:49 +01:00
Laurent Destailleur
511a75b5de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-14 18:59:07 +01:00
Laurent Destailleur
768e719961
Fix: firstname was missing
2012-11-14 18:32:52 +01:00
Regis Houssin
8908f977b8
Fix: converting line delimiters !!!
2012-11-14 11:31:08 +01:00
Laurent Destailleur
5e583b65f2
Doxygen
2012-11-14 01:35:39 +01:00
Laurent Destailleur
06c77576b7
New: Maxi debug on feature to filter lines on export. Removed a lot of
...
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
2012-11-14 00:27:25 +01:00
Laurent Destailleur
66755fb166
Fix: Avoid confusion between method getXXX into parent class with
...
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134
Doxygen
2012-11-11 17:50:24 +01:00
Laurent Destailleur
7d01ea7fc3
Fix: Do not break dolibarr usage if log fails
2012-11-06 19:42:03 +01:00
Laurent Destailleur
8896803921
New: We can use a dynamic value ($conf->global->XXX for example) into
...
titles of menus.
New: Can choose menu entry to show with external site module.
2012-11-04 21:19:12 +01:00
Laurent Destailleur
19c617e4a0
Fix: Solve double ";;"
2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0
Fix: Not enought space for free text. To avoid to edit again and again
...
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
2012-11-03 13:32:37 +01:00
Laurent Destailleur
f8a9733b73
Again 2 pixels missings
2012-11-03 00:37:10 +01:00
Laurent Destailleur
5f3ceb0081
Fix: Label for payment by cheque using the wrong translation key
...
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
2012-11-02 15:41:09 +01:00
Laurent Destailleur
fd7aea9779
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6
Fix: Bad detection of space left
2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377
Merge pull request #469 from camlafit/develop
...
Return Human readable date product
2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7
Fix: Error management
2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd
Qual: Uniformize PDF code
2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063
Merge all substitutions on same loop (Invoicing with odt)
...
* It's not necessary to have a redondant loop to substitute all variables
2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569
Return Human readable date product
...
* By default date with mktime format, not great on Invoice
2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3
New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
...
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e
Fix: Avoid warnings
2012-10-31 12:35:52 +01:00
Maxime Kohlhaas
240d310a7f
Fix : shipment PDF rouget wasn't using the right var to access related internal contact
2012-10-31 08:57:56 +01:00
Laurent Destailleur
64d8d558a5
Qual: Uniformize pdf code
2012-10-31 02:29:45 +01:00
Laurent Destailleur
42d2a0a2d1
Fix: Bad position of columns. Works with all paper format now.
2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0
Qual: Some changes to use more efficiently bottom of page when there is
...
several pages (we don't keep space for total on all pages, but only last
one)
2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7
Qual: Removed duplicate template (nearly no difference between sirroco
...
and typhon, so no need to keep them both).
2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925
Fix: The bottom margin is already included into heightforfooter
...
This provide 1cm more for product description.
2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55
Fix: Free text overlap data when not on last page.
2012-10-30 13:11:17 +01:00
Laurent Destailleur
e013fa01a7
Fix: Revert direction of option (this information is a legal issue for
...
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
2012-10-29 11:38:32 +01:00
Laurent Destailleur
9d4471dd67
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be
Fix: Better fix for import when field is computed by a function
2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf
Fix: convert line delimiters (use the last eclipse version)
2012-10-28 13:57:21 +01:00
Laurent Destailleur
ee29c65708
Move stock import into stock module (stock module is at a low level than
...
product)
2012-10-27 20:27:07 +02:00
Christophe Battarel
253e3412db
fix wrong insert sql construction
...
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
2012-10-27 12:55:28 +02:00
simnandez
9ada60afbc
New: More import options. Products categories
2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66
New: More import options. Products categories
2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83
New: More import options. Products categories
2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c
New: More import options. Customer and suppliers categories
2012-10-26 18:34:49 +02:00
simnandez
425ebae802
New: More import options. Products categories
2012-10-26 18:19:04 +02:00
simnandez
7aec227694
New: More import options. Products stocks
2012-10-26 17:52:53 +02:00
simnandez
970933ec7f
Fix: [ bug #579 ] Multi-Company and imports
2012-10-26 17:29:41 +02:00
Regis Houssin
c521a77e92
New: add key generator in webservices admin page
2012-10-26 15:20:47 +02:00
Regis Houssin
b5d70ad17f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1
New: add export filters (thank you Charles Benke)
2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c
Fix: Bad ProfId assignation in imports
2012-10-25 17:08:25 +02:00
Laurent Destailleur
daeb1029a1
New: Support field required or not
2012-10-25 13:11:55 +02:00
Regis Houssin
9d95e8bffb
Fix: missing hookmanager
2012-10-25 11:44:04 +02:00
Regis Houssin
f8f1d3a0df
Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement
...
mode and paiement method in pdf
2012-10-25 09:24:05 +02:00
Regis Houssin
23707e2346
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0
Fix: strict mode
2012-10-24 22:50:19 +02:00
Laurent Destailleur
d1a4a6a090
New: Support synchro of field job/title.
...
New: Add script to synchronize users from ldap to dolibarr.
2012-10-24 21:19:10 +02:00
Laurent Destailleur
eaad5f075e
Fix: Some fix to removed refused controls by distrib package build
...
systems.
2012-10-22 13:08:55 +02:00
Laurent Destailleur
d56791d4dc
Fix: Works with PHP 5.2
2012-10-22 00:43:59 +02:00
Laurent Destailleur
bba5057d5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7
Fix: PDF works with US executive format.
2012-10-21 15:50:53 +02:00
simnandez
aa53b7a2ba
New: More import options. Thirds Bank Accounts
2012-10-19 13:00:53 +02:00
Laurent Destailleur
0152e226c1
Fix: Use correct translation of fields
2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8
Merge pull request #453 from simnandez/develop
...
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
2012-10-18 03:31:55 -07:00
Regis Houssin
d705995a49
Fix: convert line delimiters
2012-10-18 10:36:53 +02:00
Laurent Destailleur
97001951e6
New: Add field stock into product export
2012-10-17 20:32:57 +02:00
simnandez
d7dcd3c14b
New: More import options. Supplier Products
2012-10-17 19:02:12 +02:00
Laurent Destailleur
4d5a6c6f01
Typo error
2012-10-17 15:07:13 +02:00
Laurent Destailleur
01bd20147e
Fix: Some fixes and enhancement into modularizing log functions
2012-10-17 14:46:20 +02:00
Laurent Destailleur
4a913cfb38
Merge pull request #449 from marcosgdf/odt-discounts
...
Created function to retrieve total discounted amount of a commonobject
2012-10-17 05:03:55 -07:00
simnandez
23d3b6a783
New: More import options. Supplier Products
2012-10-17 12:36:30 +02:00
simnandez
6f430cc630
New: More import options. Supplier Products
2012-10-17 11:43:26 +02:00
simnandez
cf814dc7fd
New: More import options. Categories
...
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:42:16 +02:00
simnandez
2cf88e7847
New: More import options. Categories
...
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:40:17 +02:00
Marcos García
3c051abc22
Orders and proposals should also replace {object_total_discount}
2012-10-16 13:43:50 +02:00
Marcos García
ac4ee01723
mod_syslog_syslog class shouldn't be active if openlog is not available
2012-10-16 13:39:23 +02:00
Marcos García
180eddff49
Because the rest of the class is using SYSLOG_CHROMEPHP_INCLUDEPATH it needs to be restored...
2012-10-16 02:25:48 +02:00
Marcos García
f250bb41e9
Removed unnecessary comments and commented unused config variables
2012-10-16 02:13:38 +02:00
Marcos García
07dcb07fd2
Created a modular syslog handler system
...
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
2012-10-16 02:01:37 +02:00
Marcos García
c9944a6b9b
Created function to retrieve total discounted amount of a commonobject
...
Also added an ODT tag to let people add it to their invoices, etc..
2012-10-15 00:49:39 +02:00
simnandez
6f799f8e16
New: More import options. Warehouses
2012-10-13 18:02:43 +02:00
Laurent Destailleur
6046feda11
Restore border into PDF
2012-10-11 09:42:47 +02:00
Regis Houssin
10bd942328
Fix: customer ref is very important for a best traceability
2012-10-10 12:04:08 +02:00
Regis Houssin
044ec61aba
Merge pull request #446 from atm-maxime/develop
...
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-08 23:50:49 -07:00
Maxime Kohlhaas
67dbae4486
Correction for new box inclusion
2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91
Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits
2012-10-09 00:28:52 +02:00
Christophe Battarel
04be578863
fix wrong last update in cleansep function
2012-10-08 11:32:28 +02:00
Laurent Destailleur
bdb7becbc6
Fix: Try another fix on getTrad bug.
2012-10-04 09:44:04 +02:00
Laurent Destailleur
c25e908b75
Doxygen
2012-10-03 00:30:50 +02:00
Spangaro Alexandre
3ae6117e16
Reintegrate accounting.php in admin
2012-10-02 06:07:57 +02:00
Spangaro Alexandre
3e4fd761a5
Add function to choose chart of accounts
2012-10-02 05:45:49 +02:00
Laurent Destailleur
9db72fb50d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3
New: The discount on line for supplier invoices is now supported
2012-09-28 16:08:44 +02:00
Christophe Battarel
15d7266abf
import : add csv options (separator and enclosure)
2012-09-28 10:23:04 +02:00
Laurent Destailleur
6c769cfaf3
Fix: postgresql compatibility
...
Qual: Removed deprecated code
2012-09-27 23:54:47 +02:00
Laurent Destailleur
e94ddde91d
Fix: Patch calculation field odt
2012-09-27 21:08:32 +02:00
Regis Houssin
1919604089
Fix: more compatible with multicompany transverse mode
...
Fix: strict mode bubbles
2012-09-27 11:57:46 +02:00
Regis Houssin
d58c106f66
Fix: convert line delimiters !!!
2012-09-19 17:53:09 +02:00
Laurent Destailleur
533e285dad
Merge pull request #403 from simnandez/develop
...
Trad: Add ca_ES and es_ES translations
2012-09-19 05:53:43 -07:00
Laurent Destailleur
a68483d72f
Uniformize code.
2012-09-19 14:49:13 +02:00
Laurent Destailleur
1347ecf14e
Qual: Removed warnings
2012-09-19 12:49:58 +02:00
simnandez
dd9d3c8ba4
Fix: localtaxes must display in pdf even if they are in negative
2012-09-18 17:57:52 +02:00
Laurent Destailleur
889f71db6f
Fix: Color of lines must be set for each lines
2012-09-18 12:52:54 +02:00
Regis Houssin
8bab5fdadd
Fix: convert line delimiters
2012-09-17 19:37:02 +02:00
Laurent Destailleur
ef4831d119
Solved FIXME. I keep the code but commented, to keep source the more
...
similar as possible than invoices.
2012-09-17 11:46:50 +02:00
Regis Houssin
80eceab230
Fix: restore broken features
2012-09-17 07:15:38 +02:00
Regis Houssin
10b122578e
FIXME: $deja_regle not use in proposal?
2012-09-17 06:52:33 +02:00
Laurent Destailleur
cd6a8fa761
New: Uniformize code
2012-09-17 02:07:14 +02:00
Laurent Destailleur
2170801fd2
New: Uniformize pdf generation code. We also keep space to repeat pdf
...
head info.
2012-09-17 00:43:23 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
Regis Houssin
4220229573
Fix: minor change
2012-09-14 15:56:50 +02:00
Laurent Destailleur
46ee00fc5e
A party to fish bugs and merou.
2012-09-13 18:28:03 +02:00
Marcos García
cb4044755b
Fixed export translations
...
Added missing strings
Corrected some translations
2012-09-12 19:11:03 +02:00
Marcos García
98092b952d
Fixed xinputuser emailing module
...
Lastname wasn't being recorded
2012-09-12 14:49:02 +02:00
Laurent Destailleur
1c91027a4e
Fix: Uniformize pdf code. Try to solve offset when a product line is
...
moved onto next page.
2012-09-11 14:03:16 +02:00
Laurent Destailleur
e0624abb2c
Added option THEME_ELDY_USE_HOVER to enable mouse hover, because when
...
using software a lot, it becomes annoying. So we let user choose
(choice possible only with eldy theme for the moment).
2012-09-09 14:49:20 +02:00
Regis Houssin
ee1cf819f7
Fix: mass convert line delimiters
2012-09-07 17:23:16 +02:00
Regis Houssin
5270ec06cb
Fix: compatibility with multicompany transverse mode
2012-09-07 17:20:12 +02:00
Laurent Destailleur
856c829c99
New: Add a selection module for emailing to enter a recipient from
...
gui.
2012-09-05 20:41:28 +02:00
Laurent Destailleur
84438d82f4
Qual: Clean module
2012-09-05 12:59:33 +02:00
Laurent Destailleur
b20c8d97c0
Fix: Checkstyle
2012-09-05 11:20:52 +02:00
Laurent Destailleur
246f3b5bb8
New: Add the holiday module (provided by teclib with permission to add
...
it by default).
2012-09-05 03:26:57 +02:00
Laurent Destailleur
55a5d56ebb
Fix: comment
2012-09-04 23:08:57 +02:00
Laurent Destailleur
2f680adbb5
Fix: We must use the shipping address.
2012-09-04 23:03:39 +02:00
Laurent Destailleur
aea89389e8
Qual: Uniformize pdf templates
...
Qual: Removed duplicate pdf templates when content with no technology
difference nor functionnal difference
2012-09-04 20:04:38 +02:00
Regis Houssin
15db85bc86
Fix: prepare external extended ged
2012-09-03 21:00:46 +02:00
Laurent Destailleur
9eb21c3d9f
Fix: Minot miscellanous fix
2012-09-03 10:17:58 +02:00
Regis Houssin
d2ae90f938
Fix: strict mode everywhere
2012-09-02 22:48:52 +02:00
Regis Houssin
0a88287b50
Fix: strict mode circus
2012-09-02 22:16:57 +02:00
Regis Houssin
afdab32bbf
Fix: avoid warnings (strict mode)
2012-09-02 22:12:56 +02:00
Regis Houssin
54860ef304
Fix: upgrade tcpdf and fpdi
2012-08-29 09:55:32 +02:00
Marcos García
7c0463b215
Used incorrect translation keys
...
Duplicated keys
2012-08-29 00:29:47 +02:00
Marcos García
c8869e65a6
Minor fixes to CerfaFR donation document
...
* Title wasn't localized
* Fixed donation ref
2012-08-28 09:58:15 +02:00
Laurent Destailleur
857a11f508
New: Can select thirdparties into emailing targets, even if module
...
category is not enabled.
2012-08-27 20:21:53 +02:00
Regis Houssin
3e2be54ead
Fix: restore old method
2012-08-27 19:11:44 +02:00
Laurent Destailleur
56d19437f4
Fix: [ bug #524 ] Donation receipt html_cerfafr is not localized
2012-08-26 18:01:29 +02:00
Regis Houssin
f322ec50ed
New: [ task #498 ] - final part
2012-08-25 15:21:34 +02:00
Regis Houssin
954f2afbc5
Fix: remove obsolete code
2012-08-25 10:49:59 +02:00
Grand Philippe
2d34e7bf8b
fix some issue within typhon pdf
2012-08-24 16:34:05 +02:00
Regis Houssin
4d1555f4ca
Merge pull request #338 from atm-maxime/mko515
...
Mko515
2012-08-23 00:01:05 -07:00
Maxime Kohlhaas
39de1cb010
Task 515 : Correction on SQL request
2012-08-23 08:43:29 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Maxime Kohlhaas
5fd10d14be
Task 515 : Corrections + target modules modifications
2012-08-23 00:00:01 +02:00
Marcos García
ea119c45a2
Lower-cased all <?PHP
2012-08-22 23:27:53 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Regis Houssin
4a5d89e6cc
Fix: move barcode type entries in module descriptor for best
...
compatibility with multicompany
2012-08-22 17:44:52 +02:00
Regis Houssin
3991e0b13d
Fix: add accountancy code error message
2012-08-20 01:29:13 +02:00
Regis Houssin
a856ad0afa
Fix: strict mode sunshine
2012-08-19 09:05:50 +02:00
Regis Houssin
bd99c2d23d
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-08-18 08:31:59 +02:00
Regis Houssin
d03b29ba78
Fix: [ bug #502 ] Error when validating cheque deposit
2012-08-18 08:30:29 +02:00
Regis Houssin
09e34068bc
Merge pull request #319 from marcosgdf/translations
...
A lot of improvements into translations
2012-08-17 22:22:56 -07:00
Regis Houssin
3438305169
FIXME: with ajax autocompleter, does not see the products that have no
...
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Regis Houssin
b3d09478ca
Merge pull request #313 from lrq3000/develophooks
...
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
2012-08-16 08:15:19 -07:00
Marcos García
f320ed92cc
Translated and upper-cased export formats, improved es_ES translations
...
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com )
Little refactor too
2012-08-16 13:07:12 +02:00
Marcos García
cc4d5ff8d8
Removed the use of duplicated key translations
...
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
2012-08-15 18:55:32 +02:00
Regis Houssin
48efabc8a4
Fix: remove deprecated function and avoid warnings
2012-08-15 09:06:36 +02:00
Stephen L
c0a314000c
Add custom ODT substitution for lines of products (completesubstitutionarray_lines)
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 16:03:45 +02:00
Maxime Kohlhaas
44b84b2177
task # 326 : Add a numbering module to suggest automatically a product ref
2012-08-09 01:41:55 +02:00
Laurent Destailleur
0d346ac1c1
New: A module can add several css and several js.
...
New: Removed lightbox as it is not compatible with GPL.
2012-08-08 20:43:23 +02:00
Laurent Destailleur
54c6db5b81
Qual: Uniformize code for pdf generation.
...
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
Laurent Destailleur
49f8f07737
Start to work on bug [ bug #251 ] and [ bug #260 ].
2012-08-06 19:22:14 +02:00
Regis Houssin
89cd23452f
Fix: missing delete shipping and delivery files
...
(minimum for possibility to merge with 3.2)
2012-08-05 20:41:11 +02:00
Laurent Destailleur
591b029781
Doxygen
2012-08-05 15:15:58 +02:00
Regis Houssin
d6a4d5ef41
Fix: avoid errors if install directory is deleted before module
...
activation
2012-08-01 14:42:24 +02:00
Marcos García
3520513c6b
Fixed an error that I introduced in a previous commit...
2012-07-31 00:53:05 +02:00
Laurent Destailleur
5772e46c9a
We start new modules with level "experimental".
2012-07-30 22:18:54 +02:00
Regis Houssin
e44fd4885d
Fix: change the last $DB to $db
2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Marcos García
be388b4418
Fixed some typos in es_ES and en_US translations
...
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
2012-07-29 22:23:51 +02:00
Regis Houssin
251640561f
Fix: strict mode happy hour
2012-07-28 12:35:11 +02:00
Regis Houssin
a157327859
Fix: strict mode paradise
2012-07-28 11:28:37 +02:00
Laurent Destailleur
1c557a96bd
Prepare task 473
2012-07-27 19:26:54 +02:00
Laurent Destailleur
0b048ebb94
[ bug #40 ] Export de donnes dangereux
2012-07-27 16:03:20 +02:00
Laurent Destailleur
dce9b96260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/lib/repair.lib.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
65e183c8c9
Merge pull request #258 from FHenry/develop
...
Develop
2012-07-24 09:15:36 -07:00
Laurent Destailleur
24c54ccaf1
Start to work on bug export
2012-07-24 16:19:46 +02:00
FHenry
8f2efa4879
Add syslog for debug
2012-07-24 14:25:21 +02:00
FHenry
3892c2ceca
Usubscribe mailling module
...
- Correct indentation
2012-07-24 13:24:22 +02:00
Regis Houssin
fb23364511
Fix: uniformize code
2012-07-23 16:10:54 +02:00
Regis Houssin
01ab1aa66f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/core/modules/modCommissions.class.php
2012-07-23 11:07:53 +02:00
Regis Houssin
bf807c27e5
Fix: uniformize code
2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5
Normalize code
2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91
Fix: Checkstyle
2012-07-23 10:46:09 +02:00
Regis Houssin
6e41d645f0
Merge pull request #251 from cbattarel/commissions
...
basic commissions management module
2012-07-23 01:37:09 -07:00
Laurent Destailleur
db4c6bd289
New: After first install, warning are visible onto mandatory setup
...
not configured. Show also total number of activated modules.
2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce
add commissions module
2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8
Fix: uniformize code (in progress)
2012-07-20 09:57:50 +02:00
Christophe Battarel
98a2cf547e
correct module description and image
2012-07-19 16:27:08 +02:00
Christophe Battarel
c12c8bd0bb
update margin modules to core module
2012-07-18 16:13:29 +02:00
Regis Houssin
b53d108c50
Fix: uniformize code
2012-07-11 10:14:56 +02:00
Regis Houssin
28ccc43125
Fix: avoid another warning
2012-07-10 20:45:07 +02:00
Regis Houssin
b4617ee6cb
Fix: bad test
2012-07-10 18:57:09 +02:00
Regis Houssin
226caf0152
Fix: and again, and again, and again... (strict mode)
2012-07-10 13:20:53 +02:00
Regis Houssin
ca62c3dba8
Fix: compatibility with multicompany
2012-07-06 20:50:24 +02:00
Regis Houssin
30989fc6c3
Fix: lines delimiter
2012-07-04 16:55:14 +02:00
Regis Houssin
293eab7676
New: add possibility to hide vat only if null
2012-07-04 16:52:08 +02:00
Regis Houssin
cc4b2bf69c
New: add box activity
2012-07-04 09:07:15 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Laurent Destailleur
4176287094
Fix: Panicum module for supplier accountancy code
2012-06-28 19:51:25 +02:00
Laurent Destailleur
87efb2cbb0
Add log
2012-06-27 00:41:57 +02:00
Laurent Destailleur
4792727ca6
Fix: Label was not translated
2012-06-23 15:01:08 +02:00
Regis Houssin
4db07c3d34
Fix: avoid empty email address
2012-06-15 16:54:13 +02:00
Regis Houssin
1155b0097b
New: add advanced rights
2012-06-14 20:11:54 +02:00
Laurent Destailleur
ec621d2dcb
Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil
2012-06-14 19:58:35 +02:00
Regis Houssin
7644fa96dc
Fix: uniformize code and add specific rights
2012-06-13 21:48:59 +02:00
Regis Houssin
774be84c54
Merge pull request #220 from GPCsolutions/supplier-orders-box
...
New box showing the latest supplier orders.
2012-06-11 13:02:01 -07:00
Regis Houssin
cc18dab5c9
Fix: missing remove_file action
...
Fix: use object instead id and store odt filename in object for use in
triggers
2012-06-10 17:09:10 +02:00
Raphaël Doursenaud
0f410996f7
New box showing the latest supplier orders.
2012-06-04 17:37:38 +02:00
Laurent Destailleur
c1547b6ad0
Fix: Translation of payment term/cond
2012-05-21 20:17:58 +02:00
Laurent Destailleur
30c8fcd0e1
Fix: regression sql error
2012-05-09 16:45:15 +02:00
Laurent Destailleur
50944a71db
Checkstyle
2012-05-06 00:45:15 +02:00
Laurent Destailleur
d47a78479e
Fix: several fixes
2012-05-05 23:59:14 +02:00
Laurent Destailleur
d804683b32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-04-30 15:18:24 +02:00
Laurent Destailleur
1227642db0
Checkstyle
2012-04-30 15:01:20 +02:00
Regis Houssin
79f2781bdb
Merge pull request #188 from FHenry/develop
...
Develop
2012-04-30 05:33:48 -07:00
Laurent Destailleur
19ce632d7a
Removed duplicate file
2012-04-30 14:13:16 +02:00
FHenry
dc42e16ff1
Secure URL use to CheckRead and Unsubcribe with security key in
...
configuration screen
2012-04-30 13:49:29 +02:00
Laurent Destailleur
5c46c3bcbb
Fix: Class not deleted after move.
2012-04-29 10:32:37 +02:00
Laurent Destailleur
8ea079ed96
New: Prepare change to allow usage of print sheet for any purpose (not
...
only
memeber module).
Qual: Remove duplicate declaration of version.
2012-04-28 16:37:58 +02:00
Regis Houssin
071cef15bf
Merge pull request #175 from grandoc/develop
...
Prepair to display receiptdocument within a custom place and uniformize ...
2012-04-25 09:27:03 -07:00
Grand Philippe
559c7974e9
shipping receipt modele can be used from a custom directory
2012-04-22 10:02:12 +02:00
Grand Philippe
c190d4ddf8
fix : shipping specimen is displayed, and shipping modele can be used from custom place
2012-04-22 09:28:39 +02:00
FHenry
07fc51b7ff
Remove Eclipse variable warning
2012-04-20 15:54:37 +02:00
Laurent Destailleur
334adf7ae2
Fix: Bad CR for public note. Must work when text is full text with \n
...
and also when text is HTML with br.
2012-04-20 13:54:57 +02:00
Laurent Destailleur
9114fec4ed
Doxygen
2012-04-16 12:01:32 +02:00
Laurent Destailleur
b315bf3e3a
Fix: Generate donation document
2012-04-16 01:23:53 +02:00
Regis Houssin
e49df57667
Fix: compatibility with php 5.4 and E_STRICT mode
2012-04-14 15:04:46 +02:00
Regis Houssin
026ee8ddb7
New: add possibility to define a page break, its very important for
...
internal and external modules (milestone)
2012-04-12 20:52:41 +02:00
Laurent Destailleur
11c174e209
New: Can export supplier ref
...
New: Add profid6
2012-04-11 15:27:03 +02:00
Regis Houssin
02d2872ac5
Fix: invert emetteur and problem with long phone number
2012-04-10 12:35:14 +02:00
Regis Houssin
f5097dd605
Fix: missing company logo and invert from to !
2012-04-10 12:04:14 +02:00
Laurent Destailleur
9df05381d1
Fix: Bug war.
...
Look: enhance look for map views.
2012-04-08 13:05:58 +02:00
Laurent Destailleur
6d8a639839
Fix [ bug #322 ] export
...
Fix: pgsql compatibility
2012-04-08 00:05:52 +02:00
Laurent Destailleur
e9292515bc
Fix: Long name wrapping. Sender address is third party for supplier
...
order/invoice
2012-04-07 21:34:42 +02:00
Regis Houssin
921c8607d7
Fix: multicompany sharings and uniformize code
2012-04-07 10:19:33 +02:00
Regis Houssin
13624eeb86
Fix: multicompany sharings compatibility
2012-04-07 09:20:03 +02:00
Laurent Destailleur
6d2a3edf69
War bug
2012-04-07 02:45:31 +02:00
Regis Houssin
f874d68e08
Merge pull request #151 from grandoc/develop
...
Prepair to display within a custom place
2012-04-05 04:15:49 -07:00
Grand Philippe
a66c18c4f8
Prepair to display within a custom place
2012-04-05 13:00:09 +02:00
Regis Houssin
b30669a5d6
Fix: missing $langs
2012-04-05 11:07:16 +02:00
Laurent Destailleur
a6bbe1032d
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-04-04 17:37:20 +02:00
FHenry
5bfff3920f
Module e-maillling : Correctif et evolution Accusé de lecture et
...
desinscription
2012-04-04 15:23:32 +02:00
Regis Houssin
c57063878d
New: add workflow module part for external modules
2012-04-04 09:29:05 +02:00
Regis Houssin
14b6173d87
Fix: add width and minimum height of cells parameters
2012-04-03 18:01:27 +02:00
Laurent Destailleur
bb67c95c3d
Uniformize code
2012-04-02 20:08:08 +02:00
Laurent Destailleur
84057d46cc
Checkstyle
2012-04-02 18:37:37 +02:00
Laurent Destailleur
46251db167
Qual: Use a shared function to define logo heigth.
...
Qual: Add more phpunit tests
Fix: This also solve overlapping logos.
2012-04-01 23:57:15 +02:00
Laurent Destailleur
d8c975da3d
More fields into import of products
2012-03-30 00:54:41 +02:00
Laurent Destailleur
78ae7dc075
Checkstyle
2012-03-27 09:59:28 +02:00
Laurent Destailleur
52f4f72e6f
Checkstyle
2012-03-26 22:39:43 +02:00
Grand Philippe
b3e55e179f
first step to use fichinter within a custom place
2012-03-24 18:15:07 +01:00
Regis Houssin
ffc6812241
Fix: avoid php strict mode warning
2012-03-23 18:19:50 +01:00
Regis Houssin
3c794967c3
Fix: multiple avoid warning with php strict mode
2012-03-23 17:18:33 +01:00
Regis Houssin
be7da6f52c
Fix: avoid warning in php strict mode
2012-03-23 16:44:45 +01:00
Regis Houssin
1bcbe02562
Fix: wrong original values
2012-03-23 09:15:14 +01:00
Regis Houssin
de16037b93
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-23 09:03:58 +01:00
Regis Houssin
77623a9c1b
Fix: compatibility with ckeditor
2012-03-23 09:03:36 +01:00
Laurent Destailleur
6b2c141083
Uniformize page name.
2012-03-23 00:08:34 +01:00
Regis Houssin
5d2da2c884
Fix: uniformize code
2012-03-22 08:33:44 +01:00
Laurent Destailleur
b098838b6f
Fix: Bad error management when enabling/disabling modules
2012-03-21 13:50:59 +01:00
Regis Houssin
52a8216e3e
Fix: avoid php E_STRICT errors and compatibility with php 5.4
2012-03-21 02:12:44 +01:00
Laurent Destailleur
97f0095251
PDF are better with all PDF sizes
2012-03-20 09:22:41 +01:00
Laurent Destailleur
e7d07c0a91
New: add supplier ref on supplier invoice.
2012-03-19 22:26:24 +01:00
Laurent Destailleur
3383d314c9
Doxygen
2012-03-19 17:18:11 +01:00
Laurent Destailleur
d6588a53a1
Fix: Missing global
2012-03-19 11:22:59 +01:00
Regis Houssin
4ecc64504d
Fix: use the original json functions
2012-03-18 19:59:38 +01:00
Laurent Destailleur
23d523158a
Doxygen
2012-03-18 12:51:13 +01:00
Laurent Destailleur
96e9e088e3
Doxygen
2012-03-18 02:22:54 +01:00
Laurent Destailleur
dc86095c06
Doxygen
2012-03-18 02:19:27 +01:00
Laurent Destailleur
d59848e18e
New: Enhance box management
2012-03-17 21:32:10 +01:00
Laurent Destailleur
da94f76364
New: When a module with boxes is activated, box is also activated by
...
default for everybody, except for users that had personlized their box
view.
2012-03-17 14:29:48 +01:00
Laurent Destailleur
d8becd3cdb
Doxygen
2012-03-17 01:13:10 +01:00
Laurent Destailleur
02cdd86066
Doxygen
2012-03-17 00:47:01 +01:00
Laurent Destailleur
3f11e51fbb
Doxygen
2012-03-17 00:22:48 +01:00
Laurent Destailleur
46d08a9d3b
Doxygen
2012-03-16 09:35:59 +01:00
Laurent Destailleur
6e864bc992
Doxygen
2012-03-16 09:34:19 +01:00
Laurent Destailleur
d76802630a
Doxygen
2012-03-15 09:26:14 +01:00
Laurent Destailleur
9e5cffc62b
Doxygen
2012-03-14 11:49:11 +01:00
Laurent Destailleur
66bad9ea04
Doxygen
2012-03-13 09:38:00 +01:00
Laurent Destailleur
e4b697fa75
New: Show delivery date into proposal template azur.
2012-03-04 22:18:15 +01:00
Laurent Destailleur
055689e2dc
New: Import use generated codes if not provided into input file.
2012-03-04 13:00:53 +01:00
Laurent Destailleur
dd92cea7ed
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-03 20:57:00 +01:00
Laurent Destailleur
130bca84d6
Fix: fk_stcomm is no more required.
2012-03-03 20:56:39 +01:00
Regis Houssin
bbbca891f8
Fix: missing entity
2012-03-03 20:19:21 +01:00
Laurent Destailleur
80b75fa67d
Fix: boxes must not be removed after update
2012-03-03 17:37:45 +01:00
Laurent Destailleur
2772d1dfa2
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-03 16:34:13 +01:00
Laurent Destailleur
fb6aad19e5
New: Import wizard can import personalized fields
2012-03-03 16:33:38 +01:00
Regis Houssin
5139c0a69e
Fix: time is not necessary
2012-03-03 11:38:45 +01:00
Regis Houssin
b74e24ab46
Fix: increase size
2012-03-03 09:06:26 +01:00
Regis Houssin
047edc69f9
Fix: unit test warning
2012-03-03 07:45:25 +01:00
Laurent Destailleur
cb3104220e
Fix: Instantiate if not already done
2012-03-02 19:36:43 +01:00
Regis Houssin
034b0fc4d4
New: add dol_json_encode and dol_json_decode instead
...
serialize/unserialize
2012-03-02 17:48:05 +01:00
Regis Houssin
30c7bf811b
Fix: add pdf_writeLinkedObjects method
2012-03-02 15:03:46 +01:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
Regis Houssin
61e90e0d9d
Fix: add $hookmanager parameter
2012-03-02 10:26:03 +01:00
Regis Houssin
71e5e27e7e
Fix: instantiate $hookmanager if not exist
2012-03-02 10:16:50 +01:00
Regis Houssin
64b8486494
New: add method for show linked objects in pdf
2012-03-02 08:11:40 +01:00
FHenry
0cf4619682
Emailing campaign- unsubcribe and use of md5 tag
2012-03-01 14:51:07 +01:00
Laurent Destailleur
9174182a27
Fix: Removed warning
2012-03-01 09:24:45 +01:00
Regis Houssin
6aa7e90834
Fix: merge problem
2012-03-01 08:03:27 +01:00
Regis Houssin
f3cb926c3c
Fix: use generic array for all parts
2012-03-01 13:58:33 +08:00
Laurent Destailleur
7c4e908639
models_modules isn't enough so we use same facture_invoice,
...
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
2012-03-01 02:06:08 +01:00
Laurent Destailleur
51fb1b2385
Fix: Code was sharing loop for custom dir and loop for subdir modules.
...
The loop to manage customdir must be managed by the dol_buildpath so
only loop on / + module dir must be done.
2012-02-29 20:07:17 +01:00
Regis Houssin
79c0369d66
Fix: possibility to use models of external modules
2012-03-01 01:24:00 +08:00
Laurent Destailleur
1c4ca9b335
New: Add hidden option MAIN_ADD_PDF_BACKGROUND to add a PDF as
...
background of invoice/order generated PDF.
2012-02-27 22:57:19 +01:00
Laurent Destailleur
563acb5968
For backward compatibility
2012-02-27 10:18:34 +01:00
Regis Houssin
476168410e
Fix: declaration of property
2012-02-27 09:09:34 +01:00
Regis Houssin
03e68b3d77
Fix: avoid warning
2012-02-27 09:04:41 +01:00
Laurent Destailleur
16ad5452b6
Fix: When company name is too long, wrapping overwrite address.
2012-02-26 14:27:19 +01:00
Laurent Destailleur
45f2f7b449
Fix: Second field is required
2012-02-25 16:14:59 +01:00
Regis Houssin
e2cea80f69
Fix: problem with this pdf
2012-02-24 17:25:53 +01:00
Regis Houssin
8e023bb384
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-24 16:32:29 +01:00
Regis Houssin
13f2fe84f9
Fix: missing object $db and missing variables declaration
2012-02-24 16:31:51 +01:00
Laurent Destailleur
cc6a2c8d84
Fix: Compatibility of new module setup with old setup
2012-02-24 11:06:05 +01:00
Regis Houssin
1b236c5c56
Fix: possibility to add more parameters (eg: entity=0)
2012-02-24 15:53:38 +08:00
Regis Houssin
a68ac56e5b
Fix: remove obsolete code
2012-02-23 22:01:55 +01:00
Regis Houssin
673fbc457d
Fix: add debug mode and change with new module parts management
2012-02-23 20:42:25 +01:00
Regis Houssin
e536bef00e
Fix: serialize array parameters (hooks)
2012-02-23 19:51:56 +01:00
Regis Houssin
46ad02cbc8
New: add generic function for module parts
2012-02-23 15:42:03 +01:00
Laurent Destailleur
2647cb72ac
New: Now all features can be provided by a module with all files inside
...
the directory of module.
2012-02-22 16:18:03 +01:00
simnandez
282a50512f
Fix: Use transnoentities into description
2012-02-22 09:44:46 +01:00
Regis Houssin
8b107b65e8
Fix: compatibility with multi-company shared
2012-02-21 18:09:21 +08:00
Laurent Destailleur
b8a61e73a0
New: Add product_label into substitution tags for ODT.
2012-02-20 23:58:36 +01:00
Laurent Destailleur
8d6655061e
Qual: Full description of lines for ODT generation share same
...
function.
2012-02-19 21:08:17 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Laurent Destailleur
e903719c36
Qual: Uniformize code
...
Perf: Very small per enhancement
2012-02-19 17:12:17 +01:00
Laurent Destailleur
d87e0eaae0
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-19 15:21:04 +01:00
Laurent Destailleur
75312655f1
Qual: More robust error code management when a box is renamed.
2012-02-19 13:12:11 +01:00
Regis Houssin
2cd9bcea90
Fix: restore broken encryption
2012-02-19 09:59:13 +01:00
Laurent Destailleur
a500033b10
New: Add postgresql function to resynchronize sequences
2012-02-19 03:21:10 +01:00
Laurent Destailleur
0a17345415
Doxygen
2012-02-16 18:39:22 +01:00
Regis Houssin
cd3452d71d
Fix: multicompany sharings and uniformize code
2012-02-11 10:18:09 +01:00
Regis Houssin
645d72c4a6
Fix: some bugs for multicompany sharings
2012-02-11 08:03:26 +01:00
Laurent Destailleur
aea54edfa2
Qual: Uniformize code
2012-02-08 13:43:49 +01:00
Laurent Destailleur
842fb07d08
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-08 00:22:58 +01:00
Laurent Destailleur
104a4532b9
Fix: miscellaneous not initialized vars
2012-02-07 18:48:50 +01:00
Laurent Destailleur
d686c52b63
Fix: usage of custom dir for supplier invoices
2012-02-07 18:21:22 +01:00
Laurent Destailleur
55f6cdd495
Qual: Removed warnings
2012-02-07 10:25:58 +01:00
Laurent Destailleur
2093b3f0be
New: Allow to use ODT templates for prososal like it's done for invoices
2012-02-05 19:37:52 +01:00
Regis Houssin
3302a86f0c
Fix: add entity field in llx_paiement
2012-02-01 18:29:06 +01:00
Regis Houssin
7096bc8d7f
Update htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
2012-02-01 15:11:05 +01:00
Regis Houssin
ec3f5d121c
Merge pull request #102 from simnandez/develop
...
[ task #176 ] Allow to use ODT templates. Works with Orders
2012-02-01 06:09:21 -08:00
Laurent Destailleur
0a78b3f970
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-01 14:22:35 +01:00
Laurent Destailleur
f1cd91dac5
Fix: Permission on donation module
2012-02-01 14:20:22 +01:00
Regis Houssin
c6e4206907
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4
Fix: use entity field of object
2012-02-01 11:32:55 +01:00
simnandez
53cdb31624
[ task #176 ] Allow to use ODT templates. Works with Orders
2012-01-30 18:18:40 +01:00
Laurent Destailleur
d7f7ec2372
Fix: Position of address
2012-01-29 21:46:55 +01:00
Simnandez
1f0c04a8a9
[ task #176 ] Allow to use ODT templates. Works with Orders
2012-01-27 22:35:23 +01:00
simnandez
15d1526393
[ task #176 ] Allow to use ODT templates. Works with Orders
2012-01-27 17:41:47 +01:00
Laurent Destailleur
d596920898
Doxygen
2012-01-23 18:43:30 +01:00
Regis Houssin
a29565f628
Fix: uniformize code
2012-01-23 16:38:57 +01:00
Regis Houssin
190cc7b13c
Fix: uniformize structure
2012-01-23 14:43:31 +01:00
Laurent Destailleur
d8f96328f8
Move properties
2012-01-22 02:28:49 +01:00
Laurent Destailleur
70a67bc3f1
Qual: Move a not frequently used function out of functions.lib.php
...
Enhance PHPUnit tests
2012-01-21 14:10:22 +01:00
Laurent Destailleur
77bd02e573
Fix: user is not defined during definition but during runtime, so by
...
import process.
2012-01-20 18:41:44 +01:00
Regis Houssin
156501820c
Fix: no $user object in update mode
2012-01-20 17:32:54 +08:00
Regis Houssin
66e9ea244d
Fix: Trying to get property of non-object
2012-01-20 17:32:53 +08:00
Laurent Destailleur
7fd27da616
Fix: Wrong count of nb of lines
2012-01-20 10:09:19 +01:00
Laurent Destailleur
a8ca1c721c
Uniformize way of working of trip and expenses (added "validate" step
...
after "draft").
2012-01-18 01:05:26 +01:00
Laurent Destailleur
9af78f97a8
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-01-18 00:39:39 +01:00
Laurent Destailleur
536b431452
Fix: SUPPLIER_INVOICE_FREE_TEXT
2012-01-18 00:38:53 +01:00
Laurent Destailleur
9215394965
New: Import wizard can import contacts.
...
New: A module can add import description for import wizard, even for
tables with foreign keys.
2012-01-18 00:16:02 +01:00
Spangaro Alexandre
28550dca89
Add function block/unblock for a trip credit note
...
Signed-off-by: Spangaro Alexandre <alexandre.spangaro@gmail.com>
2012-01-17 15:11:04 +08:00
Regis Houssin
64e0a4434d
Fix: use fk_mainmenu if defined
2012-01-16 19:11:45 +08:00
Regis Houssin
8adac462fa
Fix: share customer code with a referent entity
2012-01-12 18:51:40 +08:00
Laurent Destailleur
f8b2a2c774
New: Move mailman and spip feature into a specific module
2012-01-11 18:43:38 +01:00
Laurent Destailleur
9209c7c6bc
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-01-11 02:05:50 +01:00
Laurent Destailleur
86825e4c9b
New: Show payments terms and conditions onto muscadet template.
2012-01-10 21:12:01 +01:00
Regis Houssin
cb286a2449
New: add shareds thirparties between entities
2012-01-11 00:19:57 +08:00
Laurent Destailleur
b2cd7018db
Doxygen
2012-01-10 10:53:04 +01:00
Laurent Destailleur
f86ae93526
Qual: Removed checkstyle warnings
2012-01-10 10:23:57 +01:00
Laurent Destailleur
c6a96fec73
Qual: Uniformize lib filename
2012-01-08 01:59:33 +01:00
Regis Houssin
b9d9f3b5b1
Fix: bad path in error message
2012-01-06 10:19:07 +01:00
Laurent Destailleur
c598fb34c0
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-01-05 13:10:14 +01:00
Laurent Destailleur
7a00c793c6
Fix: SQL syntax error
2012-01-05 12:59:24 +01:00
Regis Houssin
37c7d2b102
Merge pull request #84 from simnandez/develop
...
[ task #176 ] Allow to use ODT templates for prososal like it's done for invoices. Working
2012-01-04 23:51:10 -08:00
Regis Houssin
187c54ae7f
[task #176 ] Allow to use ODT templates for prososal like it's done
2012-01-05 08:49:48 +01:00
Laurent Destailleur
3f8d2cbef8
Qual: Remove checkstyle warnings
2012-01-04 21:23:50 +01:00
Laurent Destailleur
90b7cd1aae
[ task #176 ] Allow to use ODT templates for prososal like it's done for
...
invoices. Move pdf and odt to doc dir
2012-01-04 02:04:55 +01:00
simnandez
283bb8e766
[ task #176 ] Allow to use ODT templates for prososal like it's done
...
for invoices. Working
2012-01-03 17:01:18 +01:00
simnandez
7d9b5a7545
[ task #176 ] Allow to use ODT templates for prososal like it's done
...
for invoices. Move pdf and odt to doc dir
2012-01-03 16:42:20 +01:00
simnandez
2a61569d9a
[ task #176 ] Allow to use ODT templates for prososal like it's done for
...
invoices. Firsts works
2012-01-02 18:23:41 +01:00
Laurent Destailleur
2d2ba75ad2
New: When invoice was generated from order, order date is visible on
...
PDF, after order ref.
2011-12-31 14:56:45 +01:00
Laurent Destailleur
92c27b1732
New: Can add a left menu (first level) into an existing top menu.
2011-12-31 01:33:12 +01:00
Laurent Destailleur
4ea77e6d55
Prepare code to allow left menu add by modules
2011-12-30 23:07:27 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00
Laurent Destailleur
0f14bb64e7
New: Can set country id for import of third party
2011-12-22 00:19:30 +01:00
Laurent Destailleur
721c9a6f5b
Fix: [ bug #253 ] Non UTF-8 characters in CSV exports
2011-12-21 16:10:11 +01:00
Laurent Destailleur
95a292f41b
Fix: Update licence files
2011-12-17 21:58:44 +01:00
Laurent Destailleur
3c611d284a
Qual: Removed deprecated code/comments
2011-12-17 18:35:12 +01:00
Laurent Destailleur
3687dc8be9
Fix: Mime detection
2011-12-17 01:16:33 +01:00
Laurent Destailleur
1b998d5443
Fix: Removed a bug with pgsql
2011-12-12 00:07:28 +01:00
Laurent Destailleur
147ddd6551
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-12-08 20:20:59 +01:00
Laurent Destailleur
604127acd3
Doxygen
2011-12-08 20:18:00 +01:00
Regis Houssin
420acb3491
Fix: bad path
2011-12-08 09:28:19 +01:00
Regis Houssin
4e8b0a2eb5
Merge pull request #63 from grandoc/develop
...
Develop
2011-12-07 10:35:54 -08:00
Grand Philippe
2920d5d840
uniformize code
2011-12-07 16:20:29 +01:00
Laurent Destailleur
1f37dc906f
Qual: Uniformize name of barcode into "barcode".
2011-12-07 11:59:41 +01:00
Laurent Destailleur
b52fc32853
Fix: fix not initialized variables
2011-12-05 19:41:38 +01:00
Laurent Destailleur
ffaf4e5465
Fix: fix not initialized variables
2011-12-05 19:03:36 +01:00
Laurent Destailleur
ebea7f6c97
Fix: fix not initialized variables
2011-12-05 18:36:54 +01:00
Regis Houssin
26646a98d8
Fix: missing translate parameter
2011-12-04 10:57:22 +01:00
Laurent Destailleur
56a0e26465
Fix: Removed tons of warnings
2011-12-01 17:09:01 +01:00
Laurent Destailleur
9f889b0439
Qual: Uniformize code for document generation of shipments.
...
Prepare usage of odt templates.
2011-11-30 12:28:01 +01:00
Laurent Destailleur
a47a16f281
Fix: Select target on supplier category
2011-11-30 11:55:33 +01:00
Laurent Destailleur
04dcc86f1a
Fix: barcode generation using genbarcode is ok.
2011-11-28 23:07:19 +01:00
Laurent Destailleur
9d1a008768
Qual: Clean code for barcode
2011-11-27 22:55:49 +01:00
Laurent Destailleur
0e4d70d664
Qual: Clean barcode module. First step to remove php-barcode.
2011-11-27 15:33:18 +01:00
Laurent Destailleur
8614ef5bef
doxygen
2011-11-26 12:36:36 +01:00
Laurent Destailleur
e170c477a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2011-11-25 02:04:31 +01:00
Laurent Destailleur
781b41737f
Fix: filter by categ
2011-11-25 02:03:02 +01:00
Regis Houssin
919523f2e2
Change default prefix if needed
2011-11-24 08:23:16 +01:00
Regis Houssin
86a48c8962
Fix: change the last database prefix
2011-11-23 21:43:25 +01:00
Laurent Destailleur
71e0f825b2
New: Add box for expired services
2011-11-23 18:10:10 +01:00
Laurent Destailleur
839781dfbe
Qual: Removed a TODO by renaming all ->monnaie into ->currency
2011-11-23 14:55:36 +01:00
Laurent Destailleur
1770a46519
Qual: Removed tons of warning
2011-11-22 14:00:03 +01:00
Regis Houssin
7a34f4d5e4
Fix: remove duplicate field
2011-11-19 09:45:01 +01:00
Laurent Destailleur
b81938fe95
Uniformize code and doxygen
2011-11-13 11:45:25 +01:00
Laurent Destailleur
9ec3500b1f
New: Add option INVOICE_POSITIVE_CREDIT_NOTE
2011-11-11 00:36:01 +01:00
Regis Houssin
f0c327c070
Fix: uniform code
...
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Laurent Destailleur
8193e8a54e
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-11-06 15:45:03 +01:00
Laurent Destailleur
8d46ae1d35
Qual: Better error managment on numbering setup
2011-11-06 15:12:18 +01:00
Regis Houssin
75ed344520
Fix: invalid EOL char
2011-11-06 09:51:55 +01:00
Laurent Destailleur
2240f5db44
Fix: Localisation of prices
2011-11-06 00:40:42 +01:00
Laurent Destailleur
40da2e23d2
Qual: Reduce sub-options of module fckeditor. This make code cleaner
...
and all this duplicated options were useless.
2011-11-05 23:18:49 +01:00
Laurent Destailleur
c16c09a451
Qual: Mutualize code to delete previews
2011-11-04 00:27:30 +01:00
Regis Houssin
7bb76a8cb2
Fix: translation
2011-11-01 15:18:33 +01:00
Laurent Destailleur
de842ef1e1
Doxygen
...
Fix: Bad vars
2011-10-29 18:15:54 +02:00
Laurent Destailleur
d183265702
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2011-10-29 17:47:30 +02:00
Regis Houssin
dea1210c2d
Fix: edit in place datepicker more stable
2011-10-28 19:31:42 +02:00
Laurent Destailleur
b6b48d61bf
New: Cheques into cheques receipts are ordered by operation date.
2011-10-28 00:47:28 +02:00
Laurent Destailleur
e780eadeed
Fix: Substitution of free text
2011-10-27 10:07:58 +02:00
Laurent Destailleur
3025359899
Fix: Substitution missing
2011-10-27 02:44:05 +02:00
Laurent Destailleur
daf19d0d07
Fix: Some fix for barcode generation
2011-10-26 12:58:10 +02:00
Laurent Destailleur
408ec1bc29
Fix: Moved file that seems to belongs to external module
2011-10-26 12:26:04 +02:00
Regis Houssin
fafde60d2c
Fix: add empty index files
2011-10-24 15:27:10 +02:00
Regis Houssin
3338649316
[task #217 ] Move core files in core directory
2011-10-24 14:11:49 +02:00
