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
Christophe Battarel
dd32dbacb5
Fix retrieving of margin info when invoice created automatically from order (used by workflow module)
2013-08-21 18:55:11 +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
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
fhenry
e19e9e1c63
Add dol_syslog
2013-05-17 21:27:15 +02:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +02:00
Marcos García
a9e63610ae
Fixed bug #866 : Standing order from an invoice suggests invoice total amount instead of remaining to pay
2013-05-01 20:40:29 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
fhenry
a06581771c
Reveiw extrafield for womplaiance with wiki
...
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
89ad634230
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
fhenry
e2d0d0d414
Fix fix as Eldy wish it
2013-04-20 00:10:20 +02:00
fhenry
a3c5bef381
Fix bug FactureLine update for PgSQL
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/41317-impossible-de-modifier-une-ligne-de-facture#41422
2013-04-19 15:12:02 +02:00
fhenry
738ed467b3
Fix bug on update invoice line in PgSQL
2013-04-19 07:54:55 +02:00
fhenry
c0c1de7992
[ task #826 ] Increasing stock when deleting an invoice
2013-04-18 08:40:29 +02:00
Laurent Destailleur
a5deb8e9d7
Fix: bug into is_erasable function.
...
Conflicts:
test/phpunit/NumberingModulesTest.php
2013-04-16 15:54:36 +02:00
Laurent Destailleur
248de05196
Fix: bug into is_erasable function.
2013-04-16 15:00:41 +02:00
Laurent Destailleur
67052933ca
Fix: PHPUnit
2013-04-14 23:42:24 +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
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
954af0f6c7
New: Add option INVOICE_CAN_NEVER_BE_REMOVED
2013-04-01 22:17:51 +02:00
Laurent Destailleur
80e34c8e1c
New: Add option INVOICE_CAN_NEVER_BE_REMOVED
2013-04-01 22:16:55 +02:00
Grand Philippe
c5e742278e
fix : trad error
2013-03-24 07:11:44 +01:00
eldy
90025f9c13
Work on revenue stamp
2013-03-23 13:07:25 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +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
Cedric GROSS
d16691c856
Add trigger BILL_UNVALIDATE when invoice is unvalidate
2013-03-09 17:38:35 +01:00
jfefe
dc1314f4f4
Retreive extrafield when fetch invoice
2013-03-06 05:31:19 +01:00
jfefe
7260e139df
Add extrafields support when create a customer invoice
2013-03-06 04:17:14 +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
Maxime Kohlhaas
1cfd32680a
Fix : set some vars when invoice is back to draft status
2013-02-13 15:43:27 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Regis Houssin
e8ce9cecf2
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:35:15 +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
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
df7bedf955
Fix: [ bug #592 ] stock sold value is wrong
2012-11-03 12:12:24 +01:00
Laurent Destailleur
1d7820c5ac
New: English bank account need a bank code (called sort code) to
...
identify an account.
2012-10-31 00:22:13 +01:00
Regis Houssin
82cb0802d0
Fix: broken feature, missing $page
...
Fix: bad field name
2012-10-28 02:14:08 +02:00
Laurent Destailleur
7385ea15db
Doxygen
2012-10-13 13:03:39 +02:00
Laurent Destailleur
091966902e
Fix: for special_code=3
2012-10-12 22:18:31 +02:00
Regis Houssin
d23188c64a
Fix: doxygen
2012-09-30 20:49:13 +02:00
Laurent Destailleur
3a98f6903e
Fix: If a customer has 2000 invoices, creating next one make 2000
...
requests instead of 1.
2012-09-27 20:54:04 +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
1347ecf14e
Qual: Removed warnings
2012-09-19 12:49:58 +02:00
simnandez
13aeca2ffd
Fix: Add type of product/service into factures for a correct localtaxes
...
calculation
2012-09-18 18:27:28 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
simnandez
4ac2ee83f2
Localtaxes also in skip_update_total comprobation
2012-09-12 19:07:23 +02:00
Laurent Destailleur
e68f861923
New: Add more test and enhancement to make new calcul_price function
...
more reliable. We need to add more PHPUnit test case on this function
(testcase using localtax1 and localtax2).
2012-09-11 01:09:34 +02:00
Regis Houssin
afdab32bbf
Fix: avoid warnings (strict mode)
2012-09-02 22:12:56 +02:00
Christophe Battarel
c1859d361a
modify margin management for global discount + correct bug (wrong constant name)
2012-08-28 10:13:58 +02:00
Regis Houssin
c9113458d9
New: [ task #498 ] part 3
2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3
New: [ task #498 ] part3
2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into task498_objectline
Conflicts:
htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8
New: [ task #498 ] part2
2012-08-23 07:50:20 +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
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Marcos García
d32ed9b39c
Missing copyright
2012-08-18 18:49:18 +02:00
Marcos García
44fd4e7eb8
Fixed a SQL error when listing lines of an invoice
...
Column 'localtax1_tx' in field list is ambiguous
2012-08-18 18:47:12 +02:00
Regis Houssin
97474bf77f
Fix: strict mode safari
2012-08-16 19:18:24 +02:00
Laurent Destailleur
068c536741
Fix: Delete all files (PROV* when validating.
2012-08-07 14:24:54 +02:00
Regis Houssin
1b2e6aa5e4
Fix: remove draft status if invoice is validated
2012-08-06 09:13:50 +02:00
Laurent Destailleur
6cf97a7317
Clean dead code
2012-08-03 14:18:48 +02:00
Regis Houssin
2e73cd7ddf
Fix: missing fields and compatibility with milestone
2012-08-01 17:38:10 +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
Laurent Destailleur
a429a930d0
Fix: Uniformize code and PHPUnit tests
2012-07-29 20:07:03 +02:00
Laurent Destailleur
d6a5b224fb
Revert bad practice: setEvent use SESSION. Such usage is limited to HTML
...
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54
Fix: try to use the new message system
2012-07-29 12:54:19 +02:00
Laurent Destailleur
66ea44886b
Fix: Permissions when using web services.
2012-07-22 02:33:21 +02:00
Regis Houssin
fafd79a0f8
Fix: uniformize code (in progress)
2012-07-20 09:57:50 +02:00
Christophe Battarel
55d547348a
margin management for invoices
2012-07-19 11:07:50 +02:00
Laurent Destailleur
3fafecffbc
Fix: field not saved into invoice creation
2012-07-13 14:06:51 +02:00
Laurent Destailleur
ee8b80813a
Fix: Date not converted correctly when using web service
2012-07-12 17:07:56 +02:00
Regis Houssin
e1b0d183e4
Fix: add commonorder and commoninvoice classes
2012-07-11 18:13:41 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Laurent Destailleur
0739942b7e
Can add more text into title shown by getNomUrl
2012-06-11 19:28:04 +02:00
Laurent Destailleur
7147994fd6
Fix: Checkstyle
2012-06-10 13:17:53 +02:00
Regis Houssin
b5246add8d
Fix: big problem with files upload and more compatible with external
...
modules
2012-05-30 00:07:06 +02:00
Laurent Destailleur
7213ae09fe
Checkstyle
2012-05-29 00:08:00 +02:00
Cédric Salvador
673f57edae
Fix: error in syslog call
2012-05-14 11:46:42 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
Laurent Destailleur
39630db91a
New: Add filter to search on suplier ref
2012-03-31 14:21:36 +02:00
Laurent Destailleur
ab6c1a5160
Qual: Add new PHPUnit test and fix bugs the test show me
2012-03-21 12:33:51 +01:00
Regis Houssin
4ecc64504d
Fix: use the original json functions
2012-03-18 19:59:38 +01:00
Regis Houssin
5e43b326fe
Try to avoid phpunit error
2012-03-17 09:08:54 +01:00
Regis Houssin
da4a29462e
Fix: php unit test error
2012-03-17 08:50:09 +01:00
Regis Houssin
391ce8490f
New: add "extraparams" field for stock extra parameters with json
2012-03-16 14:32:37 +01:00
Regis Houssin
1622a86d71
New: possibility to view/edit notes in invoice card
2012-03-16 11:12:59 +01:00
Regis Houssin
e86fed02fc
Fix: missing linked objects
2012-03-15 07:23:49 +01:00
Regis Houssin
4d1416d0e6
Fix: remove unused and deprecated method
2012-03-13 20:15:13 +01:00
Regis Houssin
f8bf7ade83
Fix: move method in common class
2012-03-13 20:01:10 +01:00
