Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7
2018-03-19 12:18:18 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
07fb29f0c4
Fix var not initialized
2018-03-16 12:18:20 +01:00
Laurent Destailleur
1716ac5f44
Fix var not initialized
2018-03-16 01:05:49 +01:00
Laurent Destailleur
98b7d4c2e2
NEW Can set the start/end date of service line in invoice templates
2018-03-12 12:27:40 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Laurent Destailleur
390618db47
Fix bad space
2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762
Fix phpcs
2018-03-10 22:41:57 +01:00
Laurent Destailleur
b0bd8cf910
Update facture.class.php
2018-03-10 12:56:19 +01:00
florian HENRY
40fb803ffd
scrunitizer
2018-03-10 09:34:33 +01:00
florian HENRY
63fb53159c
fix scrunitizer
2018-03-10 01:12:47 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink
...
7.0 betterthirdpartylink
2018-03-09 23:03:23 +01:00
Laurent Destailleur
d8d13a7348
Merge branch 'develop' into 7.0_fix_invoicelist
2018-03-09 22:37:20 +01:00
florian HENRY
a34709c112
fix better thirdparty link
2018-03-09 22:36:00 +01:00
florian HENRY
164ca682d5
fix add "late" invoice into "save last search/backtolist" feature
2018-03-09 17:23:43 +01:00
Regis Houssin
82057b3523
Fix: use code instead id
2018-03-09 08:11:02 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
861a831e24
Fix: debug
2018-03-08 11:53:46 +01:00
Regis Houssin
fd9c79fa7f
Fix: use getEntity if no rowid to compare
2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Alexandre SPANGARO
0182b724aa
Merge remote-tracking branch 'uptream/develop' into 8.0-a7
2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb
New : On invoice card, show accounting account linked
2018-03-08 06:52:31 +01:00
Laurent Destailleur
fe45e82e99
Fix use of table llx_c_paiement (param showempty was not used/set)
2018-03-07 19:00:38 +01:00
Laurent Destailleur
c1497b065c
CSS
2018-03-07 14:13:55 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Laurent Destailleur
0cfa19ee09
NEW Online payment of invoice and subscription record the payment
...
automatically.
2018-03-06 00:12:23 +01:00
Laurent Destailleur
d569adea2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-05 21:46:40 +01:00
Laurent Destailleur
2f9f4d0675
WIP Create payment of member subscription with paypal
2018-03-05 21:46:24 +01:00
Alexis ALGOUD
35002cf93d
Merge branch 'develop' into NEW_price_on_stock_mvt
2018-03-05 17:45:27 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
82fd84fb48
Fix scrutinizer errors
2018-03-04 11:22:43 +01:00
Laurent Destailleur
4137e1cc76
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-03-02 17:54:42 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
2368cb615f
Look and feel v8
2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
ee488ed83e
FIX invoice creation fails when next date not defined
2018-02-27 20:24:50 +01:00
Laurent Destailleur
f3c9d38f82
FIX invoice creation fails when next date not defined
2018-02-27 20:23:55 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
75cbc466d5
Fix warning
2018-02-27 19:08:38 +01:00
Laurent Destailleur
b090f0da9c
Fix warning
2018-02-27 19:07:58 +01:00
Laurent Destailleur
1907b9c52d
Fix search on dates on template invoices
2018-02-27 19:04:21 +01:00
Laurent Destailleur
7ba263c9ab
Fix search on dates on template invoices
2018-02-27 19:03:14 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
gauthier
4d05bff780
FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back
2018-02-27 12:27:25 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Laurent Destailleur
4866d63ece
Fix method getListOfPayments in the wrong class
2018-02-26 09:45:15 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
7ff94c88bd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-25 15:00:31 +01:00
Laurent Destailleur
251136bebf
Fix PHPUnit
2018-02-25 15:00:14 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
...
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
John
3b54afc9b2
Fix type lines import
2018-02-23 12:12:36 +01:00
John
c5b96e43c7
add new action to import order in invoice
2018-02-22 16:55:41 +01:00
John
a7a6630fad
Add popin dialog
2018-02-22 15:19:20 +01:00
Laurent Destailleur
b87feab1e3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
bc0993d6cd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-22 12:17:25 +01:00
John
3c1803f1f2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-02-21 17:44:08 +01:00
John
f313fb925b
Add new checkbox for lines
2018-02-21 17:06:40 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
John
bd0e8506f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-02-21 11:53:16 +01:00
John
629b8e618e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-02-21 11:45:23 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Marc de Lima Lucio
d3f848b7bc
FIX: supplier credit notes: harmonize discount filters part 2
2018-02-21 09:30:39 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
John
09c5dc506a
Add html dom element and fix class
2018-02-20 17:46:32 +01:00
John
5624257a6d
add new dom html5 elements and class
2018-02-20 16:49:49 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill
...
fix the bill replacement with discounts #8028
2018-02-20 15:19:19 +01:00
John
46b235c139
add auto select model when select type on create invoice
2018-02-20 15:08:57 +01:00
Laurent Destailleur
b361877ea8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/card.php
2018-02-20 12:48:28 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Laurent Destailleur
32e8bab20d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-20 11:01:20 +01:00
Laurent Destailleur
16fca2ee35
Fix bad link
2018-02-20 10:05:11 +01:00
Marc de Lima Lucio
44b0d1ca0f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-19 17:33:20 +01:00
Marc de Lima Lucio
a66f7b8bc8
FIX: supplier credit notes: wrong discount filters
2018-02-19 17:32:59 +01:00
Laurent Destailleur
d233c152a7
Code comment
2018-02-16 14:18:05 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
John
49bad95d31
fix method exist test
2018-02-15 17:04:27 +01:00
John
63987fa32e
fix invoice extrafield transmition to credit
2018-02-15 16:39:47 +01:00
Laurent Destailleur
7f8cbc0f62
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
atm-ph
c690dfb258
Fix apply global progress don't update multicurrency values
2018-02-14 10:15:38 +01:00
Laurent Destailleur
30ba1c1702
FIX #8174
2018-02-12 14:02:51 +01:00
Laurent Destailleur
975608b9d3
FIX #8174
2018-02-12 03:21:04 +01:00
Laurent Destailleur
ab21769aa2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/card.php
2018-02-08 12:58:47 +01:00
Laurent Destailleur
c988d3f1cc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2018-02-08 12:53:26 +01:00
Laurent Destailleur
074f4a3b46
Fix class not found when selecting project ref in lists
2018-02-06 00:34:14 +01:00
Laurent Destailleur
85964e02de
Fix css
2018-02-05 12:34:11 +01:00
Laurent Destailleur
5455ab3280
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Regis Houssin
8ee1186492
Fix: wrong test
2018-02-04 09:05:35 +01:00
Regis Houssin
c1e6d88442
Fix: use product_type instead special_code
2018-02-04 08:55:51 +01:00
Regis Houssin
38d735341c
Fix: remove lines with special code when convert to reduc
2018-02-02 10:24:16 +01:00
Laurent Destailleur
74a34acf77
Tab vs space
2018-02-01 02:14:17 +01:00
Laurent Destailleur
9c6b6f244c
Fix tooltip on invoice
2018-02-01 01:25:45 +01:00
Laurent Destailleur
8ae25b3c65
Fix the FACTURE_ENABLE_NEGATIVE was useless without
...
FACTURE_ENABLE_NEGATIVE_LINES
2018-01-29 16:21:54 +01:00
De Coninck Laurent
53ac13c792
check on type replacement #8028
2018-01-23 18:03:29 +01:00
De Coninck Laurent
4874d08062
fix the bill replacement with discounts #8028
2018-01-19 09:01:37 +01:00
Laurent Destailleur
768c93a707
Fix suggested amount for direct debit order
2018-01-18 18:22:10 +01:00
Laurent Destailleur
57f664c0c1
Fix vat npr for template invoices
2018-01-17 19:45:23 +01:00
Laurent Destailleur
56d702e3c6
Fix missing property in tooltip
2018-01-17 16:26:24 +01:00
Laurent Destailleur
aa1692483f
Fix colspan
2018-01-13 16:06:04 +01:00
Laurent Destailleur
8b972313ae
Fix scrutinizer
2018-01-12 15:38:53 +01:00
Laurent Destailleur
b225a6f79c
Better translation
2018-01-11 20:19:53 +01:00
Laurent Destailleur
e152e81d18
Fix close code
2018-01-11 18:24:40 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
436b653fa0
Error report
2018-01-11 00:16:45 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
Laurent Destailleur
9f79ad800b
Fix price per quantity
2018-01-09 14:20:47 +01:00
Laurent Destailleur
42e659e26c
Fix link for online payment
2018-01-08 13:21:04 +01:00
Laurent Destailleur
b9015de7e2
Fix can't edit payment mode / default bank account
2018-01-05 19:52:23 +01:00
Laurent Destailleur
d7837f8800
Try fix for #7778
2018-01-05 01:43:51 +01:00
Laurent Destailleur
a3c6746b6f
Merge #8008 manually
2018-01-04 23:50:15 +01:00
Laurent Destailleur
1464937c66
Merge #8008 manually
2018-01-04 23:44:21 +01:00
Laurent Destailleur
f19fb90ab0
Merge #8008 manually
2018-01-04 23:36:14 +01:00
Laurent Destailleur
300d4e1603
Fix disable direct debit request for replaced invoices
2018-01-04 14:35:02 +01:00
John
1331e8add7
fix filter for TYPE_SITUATION invoice
2018-01-02 17:19:42 +01:00
Laurent Destailleur
b0fefffcf8
Fix standardize api code
2017-12-28 12:44:15 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
bbcf70cf4e
Remove spaces
2017-12-28 09:48:41 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0
2017-12-28 08:46:22 +01:00
Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
9d10eb57f2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Laurent Destailleur
57603e3df4
Update api_invoices.class.php
2017-12-19 18:16:39 +01:00
Laurent Destailleur
bffed79132
Update api_invoices.class.php
2017-12-19 18:06:05 +01:00
Neil Orley
a3f4066790
NEW Update bank account when updating an invoice
...
Add the ability to update the bankaccount when updating an invoice
2017-12-19 14:14:26 +01:00
Neil Orley
fe8fac9577
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-19 12:36:46 +01:00
Laurent Destailleur
fcf04c122f
Fix phpcs
2017-12-19 00:39:01 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Neil Orley
ee6b0d7237
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-18 14:36:29 +01:00
Laurent Destailleur
98b82d712a
NEW Revenue stamp can be a percent
...
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00
Laurent Destailleur
a020dbf3d7
Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note
...
Fix since jquery 3 we can check all checkbox of credit note options
2017-12-16 01:13:55 +01:00
Neil Orley
e61d625577
FIX error message
2017-12-15 10:02:23 +01:00
Neil Orley
5ae74f8ae1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-15 09:56:02 +01:00
atm-ph
a2f4afbf88
Fix wrong or missing char for url
2017-12-13 16:17:22 +01:00
atm-ph
46770178d2
Fix since jquery 3 we can check all checkbox of credit note options
2017-12-13 15:24:09 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
9314dcb046
Fix regression
2017-12-12 10:13:48 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-11 15:21:22 +01:00
Laurent Destailleur
dbd96d1ac7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
2017-12-10 21:46:23 +01:00
Maxime Kohlhaas
12d0928244
Fix display error message when stock not enough on invoice validation
2017-12-10 19:59:56 +01:00
Laurent Destailleur
4443c0f0a0
Fix style
2017-12-10 15:24:47 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
09d3db145b
Merge
2017-12-08 13:10:13 +01:00
Laurent Destailleur
98149ae316
Fix regression
2017-12-06 23:31:42 +01:00
Laurent Destailleur
2c19c0a10e
Fix test
2017-12-05 20:16:28 +01:00
Laurent Destailleur
21ba8509c9
Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf
...
NEW link project from other company conf
2017-12-05 19:18:07 +01:00
Laurent Destailleur
5ab7fa7422
Fix location on good page
2017-12-05 15:48:24 +01:00
Laurent Destailleur
3a9bf455e2
FIX #7870
2017-12-05 13:38:24 +01:00
Laurent Destailleur
93311e3817
FIX #7885
2017-12-05 12:31:57 +01:00
ATM-Nicolas
bdf1e30ef3
Merge branch 'develop' into 6.0_fix_project_conf
2017-12-05 12:20:48 +01:00
Laurent Destailleur
8019f73f99
Fix: protection to not delete invoice if invoice is in bookkeeping
2017-12-05 10:01:30 +01:00
Laurent Destailleur
9b5f7099f7
Code comment
2017-12-03 19:50:15 +01:00
Laurent Destailleur
11286dee4a
Delete of payment
2017-12-03 11:59:16 +01:00
Laurent Destailleur
1f4a079f01
Fix bug reported by scrutinizers
2017-12-02 15:03:14 +01:00
Laurent Destailleur
38be224665
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-02 14:14:26 +01:00
Laurent Destailleur
29568287ef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-12-02 14:13:44 +01:00
Laurent Destailleur
5fae19b4d6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-12-02 14:13:29 +01:00
Laurent Destailleur
c7d0e917fb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-12-02 14:12:43 +01:00
Laurent Destailleur
9cafb08759
Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total
...
Fix product type is ignored and can generate a diffrent result with s…
2017-12-02 14:06:25 +01:00
gauthier
f04af6c1b3
FIX : test for filter fk_status
2017-11-29 11:06:33 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
atm-ph
5fef6478a5
Fix wrong calcul_price_total() update
2017-11-27 11:26:41 +01:00
Laurent Destailleur
5bdb7d1b98
Fix line "none" must not be visible if there is lines
2017-11-25 23:28:00 +01:00
Laurent Destailleur
6a9056a924
Fix line "none" must not be visible if there is lines
2017-11-25 23:26:14 +01:00
Laurent Destailleur
e99f190ff1
Save search context on list of template invoices
2017-11-25 15:56:36 +01:00
Laurent Destailleur
dbcb38dd3b
Use short label on table
2017-11-25 15:13:39 +01:00
Laurent Destailleur
1d97dd2bd8
NEW can filter on status of template invoices
2017-11-25 15:08:19 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
412c4e335d
Fix method of herited object has same signature than parent
2017-11-25 11:10:52 +01:00
Laurent Destailleur
4f4f929efb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
2017-11-24 17:02:14 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
5a2fe13958
Fix travis
2017-11-22 21:36:01 +01:00
atm-ph
219e58d0e4
Fix product type is ignored and can generate a diffrent result with situation invoice
2017-11-22 12:15:02 +01:00
ptibogxiv
16e791913f
Fix import date
...
fix import date when creation
2017-11-19 21:56:50 +01:00
ptibogxiv
35182066a8
update createfromorder
...
lack of 2 fields date_start and date_end not imported from order
2017-11-19 16:25:35 +01:00
Laurent Destailleur
f284cd6c0f
Fix phpcs
2017-11-18 02:15:56 +01:00
Laurent Destailleur
14946a0dfa
Fix sort on status
2017-11-18 02:14:04 +01:00
Laurent Destailleur
a00353f332
Fix link to create invoice from template on list
2017-11-18 02:07:52 +01:00
Laurent Destailleur
fc1441086c
Fix status in template invoice
2017-11-18 02:01:04 +01:00
Laurent Destailleur
03cc685037
NEW Add a status enabled/disabled on recurring invoices
2017-11-18 00:54:23 +01:00
Laurent Destailleur
cf0d67d71c
Generation of pdf become default value
2017-11-17 23:57:32 +01:00
Laurent Destailleur
77a0762fc1
Fix comment
2017-11-17 15:07:32 +01:00
Laurent Destailleur
2f6dfc2387
Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid
...
NEW deposits can be converted even if unpaid
2017-11-17 15:05:33 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Neil Orley
8e869688f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-11-15 10:42:00 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Neil Orley
9b2611933d
NEW Create an invoice using an existing order
...
Create an invoice using an existing order using the REST API
2017-11-14 15:49:09 +01:00
Neil Orley
e513ed09f6
Change the way pa_ht is calculated
2017-11-14 14:43:50 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
1a5bbef266
FIX Locatax were not propagated when cloning order or proposal
2017-11-13 13:07:31 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
...
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Maxime Kohlhaas
22a3721dda
Fix multi VAT deposit when special lines are in origin document
2017-11-11 16:10:06 +01:00
Maxime Kohlhaas
60fcddb9e4
NEW deposits can be converted even if unpaid
2017-11-11 12:07:55 +01:00
Laurent Destailleur
11cc82e6d2
Update doc
2017-11-10 10:15:50 +01:00
Frédéric FRANCE
5621e85c00
comment
2017-11-10 00:26:01 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
a329f7dc75
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
2017-11-05 18:50:14 +01:00
Laurent Destailleur
21a0f11395
Merge pull request #7760 from Oeris/develop-api
...
NEW Adds the payment reference to the return of the function getListOfPayements
2017-11-05 18:29:59 +01:00
Laurent Destailleur
d3a0cff30a
Merge pull request #7755 from frederic34/currency
...
default currency on propal create
2017-11-05 18:28:40 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
Neil Orley
3ecccadb8b
NEW Adds the payment reference to the return of the function getListOfPayements
...
Adds the payment reference to the return of the function getListOfPayements
2017-11-03 13:04:23 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create
2017-11-02 18:14:55 +01:00
Laurent Destailleur
309e83a946
Remove the "add" in addpayment. Action in API is hosted by the method
2017-11-02 16:06:44 +01:00
Laurent Destailleur
36f7f32205
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-02 16:02:24 +01:00
Laurent Destailleur
d70f9e053e
Remove the get in url. The GET is already in the method.
2017-11-02 16:01:13 +01:00
Laurent Destailleur
93ab4cadff
Merge pull request #7753 from Oeris/develop-api
...
NEW Add REST API to add payment line to a specific invoice
2017-11-02 15:54:22 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Neil Orley
5febdf7bae
NEW Add payment line to a specific invoice using the REST API
...
Add payment line to a specific invoice using the REST API
2017-11-02 15:01:38 +01:00
Frédéric FRANCE
01a3787664
swap llxfooter() and $db->close()
2017-10-31 13:45:13 +01:00
Laurent Destailleur
068f5e32cb
NEW Tooltip for substitutions variables on tooltips on admin pages
2017-10-31 11:17:44 +01:00
Laurent Destailleur
75bbcdf575
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-29 11:29:01 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Neil Orley
9a1c684870
FIX wrong paramters name in the usecreditnote method
...
Rename 'creditnoteid' with 'discountid' in the URI
Rename 'creditId' with 'discountid' in the method
2017-10-27 10:02:17 +02:00
Laurent Destailleur
ee1996ad37
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2017-10-27 01:16:51 +02:00
Laurent Destailleur
740c89365d
Code comment
2017-10-27 00:42:44 +02:00
Laurent Destailleur
6a9837528e
Merge pull request #7703 from Oeris/develop-api
...
FIX Data related to customer moved to thirparties api
2017-10-27 00:42:10 +02:00
Laurent Destailleur
f4a06aef3f
Update api_invoices.class.php
2017-10-27 00:36:06 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Neil Orley
da0a205a10
NEW Deduct an available credit to an existing invoice
...
Deduct an available credit to an existing invoice using the REST API
2017-10-25 17:09:37 +02:00
Neil Orley
3e53a2ecff
FIX merging conflict
2017-10-25 14:52:33 +02:00
Neil Orley
ff760eb8d5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-10-25 14:46:44 +02:00
Neil Orley
257acb6679
NEW Insert a discount in a specific invoice using the REST API
...
Add ability to insert a discount in a specific invoice.
2017-10-25 14:41:12 +02:00
Neil Orley
ec6a19a123
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api-down-payments
2017-10-25 09:57:53 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Neil Orley
b4c484cf0b
NEW Get available assets of an invoice using the REST API
...
Returns a list of paid down-payments, available avoirs, etc. with the payments detail
2017-10-24 14:29:28 +02:00
Laurent Destailleur
8592e1b1e8
Update api_invoices.class.php
2017-10-24 12:49:37 +02:00
Laurent Destailleur
b6825703b4
Update api_invoices.class.php
2017-10-24 12:47:15 +02:00
Neil Orley
c34a6db13a
Rename assets with avoirs
2017-10-24 11:53:39 +02:00
Neil Orley
41104de7ce
NEW Get available assets of an invoice using the REST API
...
Returns a list of paid down-payments, available avoirs, etc. with the payments detail
2017-10-24 11:47:25 +02:00
Neil Orley
02c8f7f905
Modify rights check in the getPayments method
2017-10-24 11:25:31 +02:00
Neil Orley
0a43a12420
NEW Get a payment list of a given invoice using the REST API
...
Add the getpayments method to retrieve a list of payments of a given invoice
2017-10-24 10:50:38 +02:00
Neil Orley
2a9ddf7437
Remove whitespace
2017-10-23 16:49:00 +02:00
Neil Orley
bd0079b3f1
NEW Retrieve available discounts and payments details from an invoice
...
Adds the ability to get availbales discounts and payments details of a specific invoice unsing the REST API.
2017-10-23 16:45:49 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
78ffe15a04
Code comment
2017-10-22 14:03:59 +02:00
Laurent Destailleur
83c1928034
Fix duplicate methods
2017-10-22 12:21:44 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Laurent Destailleur
1202853001
Fix syntax error
2017-10-19 19:12:00 +02:00
Laurent Destailleur
f7556e7ad2
FIX make of link to other object during creation
2017-10-19 19:06:48 +02:00
Laurent Destailleur
d4ade7b935
FIX API to get object does not return data o flinked objects
2017-10-19 17:57:16 +02:00
Laurent Destailleur
cb089987ee
Fix code comment
2017-10-19 12:35:15 +02:00
Laurent Destailleur
93d16bf4d7
Fix several fixes in APIs
2017-10-19 12:30:36 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
99239cbb38
Add API close to close an order
2017-10-18 15:34:03 +02:00
Laurent Destailleur
d40dda83cf
Add API "close" for proposals
...
Standardize code
2017-10-18 11:10:08 +02:00
Laurent Destailleur
d70c215ab8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/fourn/facture/card.php
2017-10-17 11:14:58 +02:00
Laurent Destailleur
81e7f45200
FIX Stats on invoices show nothing
2017-10-17 11:08:49 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
b491d22c16
FIX selection of thirdparty was lost on stats page of invoices
2017-10-14 02:30:33 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
45b4572ad4
Label shorter
2017-10-12 13:30:28 +02:00
gauthier
1e7676d26f
FIX : wrong key in selectarray
2017-10-12 09:30:04 +02:00
Laurent Destailleur
ca0af5cddf
NEW Bulk action validate on customer invoices
2017-10-12 02:25:17 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Laurent Destailleur
8f24a86352
NEW If max nb of generation is reached, date for next gen is striked
2017-10-09 14:16:22 +02:00
Laurent Destailleur
8aa924fa08
NEW The bank account is visible on payment of taxes
2017-10-07 21:03:46 +02:00
Laurent Destailleur
af1d2bfffd
Standardize code
2017-10-07 14:11:01 +02:00
Laurent Destailleur
1b399dc8dd
Update api_invoices.class.php
2017-10-07 13:28:04 +02:00
Neil Orley
925a86b2ba
NEW Delete a line of invoice using the REST API
...
Adds the ability to delete a line of an invoice using the REST API
Rename a post action with a "verb"
2017-10-06 20:49:58 +02:00
Laurent Destailleur
f9d9642340
FIX #6981
2017-10-06 14:07:28 +02:00
Laurent Destailleur
d28188d19d
FIX Generation of invoice from bulk action "Bill Orders"
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3
FIX Generation of invoice from bulk action "Bill Orders"
2017-10-04 14:27:10 +02:00
Laurent Destailleur
436ec93084
FIX is_erasable report bad value when thirdparty was not loaded
2017-10-04 03:22:41 +02:00
Laurent Destailleur
a6cf934973
Add log
2017-10-04 02:46:01 +02:00
Laurent Destailleur
3a41f2bddb
Fix test when numbering ref is only numeric char.
2017-10-04 01:27:19 +02:00
Laurent Destailleur
c08f33507f
More accurate error code
2017-10-04 00:51:25 +02:00
Laurent Destailleur
8794e54eba
Try to fix phpunit
2017-10-03 22:52:57 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
b40012d08f
Merge pull request #7535 from Oeris/develop-api
...
NEW Set invoices as draft using the REST API
2017-10-03 16:46:12 +02:00
Laurent Destailleur
9d6498f2a4
NEW Search filters in lists are restored when using "back to list"
2017-10-03 14:50:52 +02:00
Regis Houssin
e65b21a3bf
Fix: change the parameter value of dol_getIdFromCode
2017-10-02 11:59:17 +02:00
Neil Orley
503129c9f4
Rename method draft and paid to settodraft and settopaid
2017-10-02 11:51:54 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Neil Orley
5b91a6a37b
NEW Sets an invoice as paid using the REST API
...
Adds the ability to set an invoice as paid using the REST API
2017-10-02 11:17:46 +02:00
Neil Orley
91a1d6c17e
NEW Set invoices as draft using the REST API
...
Adds the ability to set an invoice status as draft using the REST API
Change response when validating an invoice: before returned 200 + text message, now returns an invoice object
2017-10-02 10:55:34 +02:00
Laurent Destailleur
884fc5d249
Update facture.class.php
2017-10-02 01:25:00 +02:00
Laurent Destailleur
fa6c3eff80
More PHPunit on invoice deletion
2017-09-30 12:53:24 +02:00
Regis Houssin
4a63e6b6ec
Fix: two errors when you create invoice from shipping
2017-09-29 19:07:13 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
Laurent Destailleur
be60e66d62
Uniformsize code/options
2017-09-27 16:29:33 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
7178bf0132
Work on direct external link for dolibarr objects
2017-09-26 16:56:33 +02:00
Laurent Destailleur
49982b36ac
FIX #7490
2017-09-26 11:55:19 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
3f9cae745c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-24 23:40:57 +02:00
Laurent Destailleur
af384f14ae
FIX #7477
2017-09-24 23:40:42 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
ddefdd12fb
Merge pull request #7460 from dvasseur/develop
...
FIX: REST API, date field not used for invoices creation
2017-09-24 21:56:41 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Neil Orley
9498fca5e1
Add of implementation notes with an exemple
2017-09-22 12:24:42 +02:00
Neil Orley
1aedc4a793
Change the term 'order' by 'invoice'
2017-09-22 12:18:11 +02:00
Neil Orley
ad6778a1cf
NEW post lines of an invoice using the REST API
...
Adds the ability to post a new lins in an invoice using the REST API
2017-09-22 12:08:11 +02:00
Neil Orley
f985b1ede6
NEW GET lines of an invoice in the REST API
...
Adds the ability to get lines of an invoice using the REST API
2017-09-22 12:00:54 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Laurent Destailleur
9875d20eaf
Add more columns in list of invoices templates
2017-09-21 18:35:47 +02:00
David
9dab694bb0
FIX: REST API, date field not used for invoices creation
2017-09-21 17:48:12 +02:00
Laurent Destailleur
577c64cc37
WIP work on param download on payment page
2017-09-20 17:23:36 +02:00
Laurent Destailleur
04e1458a3f
Fix clean parameters
2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
fappels
8123562ded
Fix extrafield copy next situation invoice
2017-09-19 18:42:29 +02:00
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02:00
Laurent Destailleur
9838199de1
FIX Sign of amount in origin currency on credit note created from lines
2017-09-18 23:53:17 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
b4eab24490
Add project into list of customer orders
2017-09-16 20:32:28 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2017-09-16 12:11:18 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Regis Houssin
cbd8cb8cb7
Fix: missing merge conflict
2017-09-15 17:32:49 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
38621b622e
Fix specimen not complete for multicompany
2017-09-13 20:11:51 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
Laurent Destailleur
c5961d8386
Pass user to the delete function
2017-09-12 14:34:33 +02:00
Laurent Destailleur
531ebc4c48
Fix merge
2017-09-12 13:53:55 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
627dd15b44
Suggested link for online payment use the generic link
2017-09-12 12:18:26 +02:00
Laurent Destailleur
cda8c6e41a
Fix ref must be 50
2017-09-12 11:51:51 +02:00
Laurent Destailleur
44405e5415
Fix #7335 #7365 Better fix
2017-09-11 15:04:29 +02:00
Laurent Destailleur
646e8713f2
Remove duplicated logs
2017-09-11 13:41:40 +02:00
Laurent Destailleur
b87ce172c3
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2017-09-11 13:40:34 +02:00
Laurent Destailleur
59ab52c718
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2017-09-11 13:39:03 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
9253207842
NEW template invoices support substition key
...
__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__
__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__
2017-09-11 02:11:31 +02:00
Laurent Destailleur
26385fa10d
FIX Clean bad parameters when inserting line of template invoice
...
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
2017-09-11 01:06:48 +02:00
Laurent Destailleur
86b28a01c7
FIX Clean bad parameters when inserting line of template invoice
2017-09-11 01:04:53 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
1154f871f1
Update fiche-rec.php
2017-09-04 10:52:49 +02:00
Laurent Destailleur
084ea049d8
Minor bugs
2017-09-03 16:07:21 +02:00
Marcos GarcÃa
ac7f1035e1
FIX #7325 Default VAT rate when editing template invoices is 0%
...
Close #7325
2017-09-03 12:25:27 +02:00
Laurent Destailleur
a3d5d97d05
Fix translation
2017-09-03 02:19:38 +02:00
Laurent Destailleur
cf5c34c8fb
Remove useless link
2017-09-03 02:13:55 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
d3c95e030b
Fix delete file not possible for external user even with permissions
2017-08-30 14:34:36 +02:00
Laurent Destailleur
945fb61e59
Update facture.class.php
2017-08-29 18:22:01 +02:00
atm-quentin
07f7db1b6d
FIX createFromCurrent lastvalue
2017-08-29 11:22:50 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Laurent Destailleur
e04dd3c807
Fix php unit
2017-08-27 15:05:35 +02:00
Laurent Destailleur
6c93c6f6cc
Fix PHPunit
2017-08-27 13:38:42 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
John
040071b07b
Change copyright comment
2017-08-25 16:25:40 +02:00
John
c9643109df
Fix comment doc
2017-08-25 16:21:34 +02:00
Laurent Destailleur
7d9a18a63d
Fix sql error
2017-08-24 15:39:23 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
John
b18104788e
New extrafield on facture_rec
2017-08-22 15:22:41 +02:00
Laurent Destailleur
b3d1cdf84c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-08-22 10:11:32 +02:00
Laurent Destailleur
9be342bd25
Fix missing $form
2017-08-22 10:02:45 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
b0adc9cca4
Merge pull request #7207 from atm-quentin/FIX_next_situation_load_extrafields
...
FIX next situation keep extrafields
2017-07-31 02:24:46 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
atm-quentin
09a1118036
FIX extrafields for invoice too
2017-07-26 15:55:50 +02:00
Regis Houssin
89a9049ccb
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-26 15:25:17 +02:00
atm-quentin
29a4900d0b
FIX_next_situation_keep_extrafields
2017-07-26 15:20:31 +02:00
Laurent Destailleur
d0682c76d6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-26 10:12:54 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
abb346651e
Close #6807
2017-07-25 21:27:07 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
764b47cf47
Merge pull request #7202 from atm-florian/dev_depositinvoicemoreexplicit
...
NEW : Deposit invoice more explicit in invoice line description
2017-07-25 19:22:42 +02:00
florian HENRY
cdcbff2a85
NEW : generate invoice PDF on disount application or payment
2017-07-25 12:20:51 +02:00
florian HENRY
0dba6f3383
NEW : Deposit invoice more explicit in invocie line description
2017-07-25 11:32:41 +02:00
Laurent Destailleur
cba898e2b9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
aa9b4ce1f3
Fix too long combo for tags
2017-07-25 09:49:08 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
2efb86b5d8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
5207b84e8b
Fix compatibility with indian IGST/CSGST/SGST
2017-07-22 01:56:38 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
a416ec4258
Try to fix travis
2017-07-18 14:25:07 +02:00
phf
885fc3c5b7
Fix lost search value in list if come from thirdparty card
2017-07-17 11:04:48 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
3ac85e10c5
NEW Add mass action "validate" on supplier invoices.
...
NEW Add date_valid and date_pointoftax on supplier invoices.
2017-07-14 14:40:09 +02:00
Laurent Destailleur
3db7bd7624
Fix look and feel v6
2017-07-13 17:44:12 +02:00
Laurent Destailleur
2b77c9b5c7
FIX #7050
2017-07-13 16:56:36 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
34d0c79e32
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
...
New add trigger disable to updateline functions
2017-07-07 20:30:04 +02:00
Laurent Destailleur
b7af0cca63
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
fd5f992be4
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-07-07 19:15:18 +02:00
Laurent Destailleur
4c1b485d47
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2017-07-07 19:06:25 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
fappels
6effcb0829
New add trigger disable to updateline functions
2017-07-06 16:26:15 +02:00
arnaud
ca6ce2ba8b
FIX status were wrong on product referent list
2017-06-30 10:38:54 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
arnaud
65b9b70ff8
FIX invoice page list
2017-06-27 15:23:51 +02:00
John
93477c102f
FIX delete linked element on facture rec
2017-06-26 15:44:04 +02:00
Laurent Destailleur
a05bbd651c
Fix translation
2017-06-23 11:09:29 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
1c8daf9700
Standardize and debug code of module BlockedLog
2017-06-16 12:46:15 +02:00
Laurent Destailleur
26e80045a6
Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW log download or preview event on a validate bill
2017-06-16 11:06:27 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
c088ccea32
Fix better management of export of extrafield computed.
2017-06-13 18:50:31 +02:00
alexis Algoud
ef0907d89e
NEW log download or preview event on a validate bill
2017-06-13 15:55:22 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
9341d5f448
FIX Line of invoices not inserted when using POS module and VAT NPR.
2017-06-09 15:35:27 +02:00
Regis Houssin
58b3d86b49
Fix: errors
2017-06-09 09:40:43 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
a25facef7c
Fix: use 0 instead false
2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
3555bd2bd7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
2017-06-03 01:29:59 +02:00
gauthier
fb252706f9
FIX : situation_progress param default value must be 100 and not 0
2017-06-01 15:42:19 +02:00
Regis Houssin
aa780ea33b
Fix: missing dot
2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
ae6c58fb57
FIX #6808
2017-05-29 14:16:09 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
b22817c237
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2017-05-29 10:25:07 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
5992175b68
Standardize code between customer and supplier invoice list.
2017-05-21 03:23:44 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
54f9990467
Merge pull request #6836 from atm-ph/fix_deposit_calculation
...
Fix wrong calculation
2017-05-20 11:57:05 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
a8afa547f0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
2017-05-17 15:20:17 +02:00
arnaud
c9738aa7ea
FIX doactions hook missing in invoice model page
2017-05-16 11:34:00 +02:00
Laurent Destailleur
ce84990414
NEW On invoices generated by template, we save if of source template.
2017-05-16 02:46:19 +02:00
phf
d120a391f9
Fix use $numlines instead $i
2017-05-15 10:26:40 +02:00
Alexandre SPANGARO
becd023032
Fix : tooltip on supplier invoice payment
2017-05-15 05:11:00 +02:00
Alexandre SPANGARO
4dc7d5cd8d
Fix : tooltip on bank in customer invoice card
2017-05-14 21:20:35 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
b568877f22
Merge pull request #6829 from grandoc/new_branch_10_05
...
Update code using new css class
2017-05-13 19:47:27 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b81de35703
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
phf
17f37cc9e1
Fix wrong calculation
2017-05-11 11:41:00 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
philippe grand
b7b16dc632
Update code using new css class
2017-05-10 16:41:19 +02:00
Laurent Destailleur
199b4dfeb5
Merge pull request #6816 from Gecka-Apps/5.0-fixes
...
Add local taxes support to predefined invoices
2017-05-10 14:52:23 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
383dfc0c96
FIX Pagination of invoices
2017-05-10 11:51:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
0b97ee42cf
NEW Can use a credit note into a "down payment/deposit".
2017-05-09 18:15:50 +02:00
Laurent Dinclaux
c88656edb4
Fix PHPDOC comments
2017-05-09 23:59:37 +11:00
Laurent Dinclaux
6cac627117
Add support for localtaxes to predefined invoices
2017-05-09 23:19:16 +11:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Laurent Destailleur
806157ae40
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 17:52:22 +02:00
Laurent Destailleur
15d20497c8
FIX #6795 #6796
2017-05-05 17:46:22 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
82c8cee1ff
Merge pull request #6751 from AlainRnet/patch-5
...
FIX #6614 without html.formprojet.class.php called, not possible create invoice…
2017-05-04 20:58:50 +02:00
Laurent Destailleur
944cd40ef4
Merge pull request #6749 from atm-florian/5.0_fix6614
...
FIX #6614
2017-05-04 13:59:24 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Laurent Destailleur
58e2b49b1c
Clean code
2017-04-30 13:49:06 +02:00
Laurent Destailleur
7c2b3b8df0
NEW When down payment is entered, discount to reuse into final invoice
...
is automatically created. This save one click into invoice workflow.
2017-04-30 12:55:11 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
AlainRnet
d9cdaeb851
without html.formprojet.class.php called, not possible create invoice template
...
cf. https://github.com/Dolibarr/dolibarr/issues/6614
without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.
2017-04-24 15:43:36 +02:00
florian HENRY
8f97177dae
FIX 6614
2017-04-24 14:44:44 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-17 06:51:02 +02:00
Juanjo Menent
3308775c06
Merge pull request #6701 from joseplluis/patch-6
...
NEW Show local taxes in facture list
2017-04-16 11:03:59 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
ac884ec463
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/install/repair.php
2017-04-15 16:28:08 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Josep LluÃs
deb309ab7e
NEW Show local taxes in facture list
...
Show localtax1 and localtax2 in facture list, only if they are enabled in company config
2017-04-13 08:30:48 +02:00
Laurent Destailleur
6f4ce8dc2f
Merge remote-tracking branch 'origin/3.9' into 4.0
2017-04-12 14:22:47 +02:00
Laurent Destailleur
d78f3923ee
Support of preview for pdf with several pages
2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
4eaa1d4f46
Add nb of generation into list of template invoices
2017-04-11 20:07:35 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Laurent Destailleur
e08b92d913
Merge pull request #6665 from defrance/patch-4
...
Add invoice_rec_prepare_head for reccuring invoice
2017-04-11 11:13:12 +02:00
Marcos GarciÌa de La Fuente
996b5e9f87
Corrected translation errors and little bug showing a non-available button to a restricted user
2017-04-09 18:17:46 +02:00
BENKE Charlie
54780ff205
Update fiche-rec.php
2017-04-09 11:33:09 +02:00
vvnt
ff75077b34
Fix: bug #6653 situation invoice miscalculation
...
Bug (#6653 )
In price.lib.php (htdocs\core\lib\price.lib.php), the function calcul_price_total() is defined (line 76). The 7th parameter is **$remise_percent_global**.
However, this function is called on facture.class.php (htdocs\compta\facture\class\facture.class.php) and the 7th parameter used is **$line->product_type**. Consequently, invoice situation is correct when user sells a product (product_type = 0) and is wrong when user sells a service (product_type = 1).
Effectively, in the latter case, the total situation invoice will be wrong by 1%.
In order to correct this, we can add 0 as the 7th parameter and move **$line->product_type** to the 10th parameter.
2017-04-08 20:15:14 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
arnaud
6b2d8a3c34
FIX limit+1 dosn't show Total line
2017-04-06 11:14:15 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
93687997c9
Work on 6.0 look and feel
2017-03-31 18:40:53 +02:00
Marcos GarciÌa de La Fuente
2448b9ee55
FIX #6619 Template invoices list do not respect restricted thirdparty user rights
2017-03-30 14:52:26 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
2f439fed85
Code for 6
2017-03-28 13:31:28 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
BENKE Charlie
2b1c29316f
Display totalLine if one of total field are present
2017-03-24 22:13:58 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
florian HENRY
ab0783edcc
FIX #6234
2017-02-08 17:18:06 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-02 02:24:57 +01:00
Laurent Destailleur
18f3e11c10
Merge pull request #6339 from atm-maxime/fix_numbering_display_error
...
Fix numbering was disaplying technical error instead of error message
2017-02-02 00:49:18 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
24c21cca27
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-28 15:56:27 +01:00
Laurent Destailleur
4f76626f51
FIX Creation of credit note on invoice with deposit stole the discount.
2017-01-28 15:55:44 +01:00
Laurent Destailleur
fd90bf466b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
c88e63ecc9
FIX #6259
2017-01-28 15:01:17 +01:00
Maxime Kohlhaas
7b6488b1c7
Fix numbering was disaplying technical error instead of error message
2017-01-27 10:05:57 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
9f1959ffc8
Fix MVC Actions must be done before output
2017-01-27 01:21:20 +01:00
florian HENRY
28115689e8
fix : wrong $formproject->select_projects call on model invoice
2017-01-26 08:46:39 +01:00
Quentin Vial-Gouteyron
94b42021bd
fix payment method
2017-01-24 15:15:31 +01:00
Quentin Vial-Gouteyron
6011c98515
FIX payment method exception
2017-01-24 12:22:23 +01:00
Quentin Vial-Gouteyron
39a92df647
Massive withdrawal request
2017-01-24 11:50:07 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Marcos GarciÌa de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Ferran Marcet
ae7f49b5d8
FIX: Deposits and credit notes weren't added in the received and pending columns
2016-12-21 18:40:05 +01:00
Laurent Destailleur
2dcb97e61d
Continue work on dol_banner
2016-12-11 13:16:21 +01:00
Maxime Kohlhaas
6474591e25
Allow to enter price in currency
2016-12-10 19:54:16 +01:00
florian HENRY
e61770671a
fix : create project from facture rec and back url wrong
2016-12-10 12:53:58 +01:00
Laurent Destailleur
49f5ec6b52
Fix bugs reported by scrutinizer
2016-12-07 19:12:25 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
e846d74654
Fix sort on invlice list
2016-11-30 15:19:16 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
017b18d5c6
Fix #6037 #6041
2016-11-27 16:09:16 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
63d0622790
Fix phpcs
2016-11-24 19:48:28 +01:00
Laurent Destailleur
60b1591f0e
Fix the notes must not be into the tooltip of ref.
2016-11-23 20:30:43 +01:00
Laurent Destailleur
2b944728fd
Fix code comment
2016-11-23 19:29:41 +01:00
Laurent Destailleur
97034a7dff
FIX #6009
2016-11-22 20:17:20 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
af2f4cf78d
Merge branch 'patch-20' of https://github.com/defrance/dolibarr into
...
defrance-patch-20
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/install/mysql/tables/llx_facturedet.sql
2016-11-12 13:36:45 +01:00
Laurent Destailleur
35d80aa209
Miscellaneous fixes
2016-11-12 12:40:06 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
2cfcca82b4
Fix list of linked object block
2016-11-11 02:18:48 +01:00
florian HENRY
9daac25519
Fix translation for CRON
2016-11-10 08:31:08 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
fcca3d6be1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-11-08 17:21:41 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
BENKE Charlie
f7294d5c3f
Update fiche-rec.php
2016-11-05 11:04:16 +01:00
Laurent Destailleur
59291be6e0
NEW Can filter on status on objects on the "statistics" page.
2016-11-03 19:50:04 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
7c75d98f9a
FIX #5866
2016-10-29 18:43:12 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Laurent Destailleur
854e75513b
Fix bad alias
2016-10-25 21:44:10 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
39bc78909b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d
Save information of vat code into database
2016-10-24 03:23:40 +02:00
Laurent Destailleur
9560ec54cc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
63628f6a01
Uniformize look and feel
2016-10-17 21:27:40 +02:00
Laurent Destailleur
17379cb5cd
Fix var_dump
2016-10-17 20:08:02 +02:00
Laurent Destailleur
70e5d29b28
Fix group by
2016-10-17 10:37:29 +02:00
Laurent Destailleur
47ed731242
Fix group by
2016-10-17 10:37:01 +02:00
Laurent Destailleur
28933c31dd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
2016-10-16 19:04:33 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
a7c6ecc177
Fix better compatibility with multicompany
2016-10-14 16:05:25 +02:00
Sergio Sanchis
63a7b506b1
Fix: Error if exist extrafield
2016-10-14 10:55:54 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Laurent Destailleur
c908af6758
Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
...
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Yann Verry
f4347ec60e
replace double quote per simple quote in update_frequency SQL
...
Fix #5835
2016-10-04 21:56:53 +02:00
gauthier
b35a4eb1b2
Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month
2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1
NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month
2016-10-04 15:45:23 +02:00
Laurent Destailleur
3599f2c840
Uniformize code for recurring invoices
2016-10-04 12:31:45 +02:00
Laurent Destailleur
d81cd7ebbe
NEW Can link template invoice to other objects. Generated invoice will
...
be linked to same objects.
2016-10-04 11:14:00 +02:00
Laurent Destailleur
5c9fa28e79
Fix search on invoice type
2016-09-29 10:38:15 +02:00
aspangaro
31511a601d
Disable by default
2016-09-29 07:03:39 +02:00
aspangaro
210601f78b
New: Add type invoice in customer search list
2016-09-29 07:01:58 +02:00
Laurent Destailleur
ce1f57786a
Merge pull request #5794 from mrsof/develop
...
NEW add confirm on reapeatable/template invoice deletion
2016-09-28 20:01:39 +02:00
Laurent Destailleur
e4f17c8763
FIX #5793 Normalise code.
2016-09-28 17:56:54 +02:00
Sof
23dffa33a6
Fix : email adress
2016-09-26 19:32:31 +02:00
Sof
86a06de015
New : add confirm on invoice deletion
...
Alternatively reformated all code
2016-09-26 19:29:54 +02:00
Laurent Destailleur
e92184a738
Fix bad var $db
2016-09-26 14:55:36 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
aspangaro
922495d72d
Correct travis & typo "Execuete"
2016-09-24 07:18:38 +02:00
Laurent Destailleur
133657a8c7
Uniformize code
2016-09-21 01:25:34 +02:00
Laurent Destailleur
c2f4bc90ab
NEW Can sort on status reccurin invoice in list of template invoices.
2016-09-19 16:52:33 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
41545e0d60
Fix compatibility of recurring invoices with postgresql
2016-09-10 05:26:31 +02:00
Laurent Destailleur
7c9996c840
Fix when creating recurring invoice, date next gen was not set
2016-09-10 05:25:07 +02:00
Laurent Destailleur
d821df070b
Fix multicompany: recurring invoice must be in same env than template.
2016-09-10 04:33:23 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Laurent Destailleur
8fd082cf16
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
aspangaro
3892f295c7
Uniformize presentation of customer's invoice
2016-08-31 06:27:35 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
6b7d509e44
Fix css
2016-08-29 18:12:53 +02:00
Laurent Destailleur
9c1ba67169
Fix css
2016-08-29 16:40:51 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Laurent Destailleur
e22e243bc5
NEW Can set to paid automaically social or fiscal contributions after a
...
payment was recorded.
2016-08-22 14:31:15 +02:00
Laurent Destailleur
f06545a3fe
Fix cancel button ignored
2016-08-19 17:22:53 +02:00
Laurent Destailleur
83107746ad
Fix no way to fix the ref of recurring invoice when an error was done
...
into typing.
2016-08-19 16:18:39 +02:00
BENKE Charlie
45a0df53d8
Update facture.class.php
2016-08-17 16:42:02 +02:00
BENKE Charlie
025a0dc0b4
Update facture.class.php
2016-08-07 14:36:48 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
86f576f8d3
Fix strict sql
2016-08-02 13:45:35 +02:00
Laurent Destailleur
dfc38351ef
Fix $i not initialized
2016-08-01 19:48:39 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
aspangaro
4a0eb496fa
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
...
Conflicts:
htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
3cdb2d45c2
Uniformize presentation customer invoice
2016-08-01 07:10:42 +02:00
Laurent Destailleur
5b4c215526
Fix size of field too small and bad translation
2016-07-30 10:31:56 +02:00
Laurent Destailleur
b85bb8c0f8
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
4e8e7f8e05
NEW New REST API explorer. Can create invoice and orders with lines.
2016-07-29 02:28:51 +02:00
Laurent Destailleur
80ac99e9b1
Fix missing field into response
2016-07-28 23:50:17 +02:00
Laurent Destailleur
9ca7f2cb66
Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by
...
default).
2016-07-28 19:02:23 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
ee0c77a305
Merge branch 'refactor-rest-api' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api
Conflicts:
htdocs/api/admin/explorer.php
2016-07-27 14:06:14 +02:00
Laurent Destailleur
e0f5a3cfe9
Fix send email in mass action
2016-07-25 21:51:29 +02:00
Laurent Destailleur
f0a3a5ce02
NEW Mutualize mass action. So "Send by email" is also avavilable on
...
orders.
2016-07-25 21:50:41 +02:00
Laurent Destailleur
a82e551a54
Start to work to mutualize code of mass actions
2016-07-25 19:43:07 +02:00
Laurent Destailleur
9b17d8dcc3
Fix code lost
2016-07-23 12:24:26 +02:00
Laurent Destailleur
08d23b482b
NEW Introduce mass action "delete" on sales orders.
2016-07-23 12:17:47 +02:00
Laurent Destailleur
5bbd8eded9
Code comment
2016-07-22 18:32:45 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
florian HENRY
d3344f5291
sd
2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce
fix problem with call update method after fetch on invocie lines
2016-07-18 07:37:18 +02:00
Laurent Destailleur
dd7c7b9d4b
Merge pull request #5467 from atm-florian/add_update_trigger
...
NEW : review Propal/Order/Invoice class to be uniformize on triggers calls
2016-07-14 23:00:11 +02:00
Laurent Destailleur
73f574b649
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/repair.php
2016-07-12 19:30:01 +02:00
Alexis Algoud
572b2fdec7
FIX dasboard wrong for late invoice
2016-07-12 15:01:43 +02:00
florian HENRY
10b0e5dd57
clean trigger and normalize code
2016-07-08 21:28:21 +02:00
florian HENRY
2d9876d127
clean command class
2016-07-08 21:02:27 +02:00
florian HENRY
195d6187a3
NEW : Uniformize code and correct deal with triggers
2016-07-08 20:40:25 +02:00
Laurent Destailleur
a669b61b69
Code comment
2016-07-05 18:33:13 +02:00
florian HENRY
215f397f33
Cannot reproduce 4793 still fix other bug on PgSQL
2016-06-30 17:28:13 +02:00
Laurent Destailleur
8bcd2e581f
Fix of bugs reported by scrutinizer
2016-06-29 11:20:48 +02:00
Laurent Destailleur
2c97d0855a
Fix: On template invoice, edition of line was not complete.
2016-06-28 17:51:29 +02:00
Laurent Destailleur
b529a53501
Fix var not initialized
2016-06-28 02:36:40 +02:00
Laurent Destailleur
1368e6d462
Fix: error message was not enough to understand
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b
Fix: error message was not enough to understand
2016-06-24 17:04:59 +02:00
Laurent Destailleur
3b38e5a870
FIX Withdraw request should not be possible if amount is negative.
2016-06-24 03:00:34 +02:00
Laurent Destailleur
2e4c6597d8
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:05:00 +02:00
Laurent Destailleur
f6119cfee8
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:03:08 +02:00
Laurent Destailleur
9b50150fe8
FIX #5380
2016-06-23 20:54:04 +02:00
Laurent Destailleur
4a408e76e7
Fix download of mass generated files.
2016-06-22 21:06:08 +02:00
Xebax
e12e1980fc
REST API: Add comments in the @deprecated tags.
2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d
REST API: Bring back the existing API (for backward compatibility).
...
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
2016-06-22 10:08:54 +02:00
Laurent Destailleur
52f414ad73
Fix selection of visible fields on customer and supplier lists. Filters
...
are ok now. Order of list of fields in selection is same than in output
array.
2016-06-21 15:16:33 +02:00
Laurent Destailleur
73fb7b2615
Fix phpunit regression. phpunit test on ws invoice is cleaner.
2016-06-21 01:07:44 +02:00
Xebax
8cf0bceadd
REST API: replace the /invoice/ API by /invoices/.
...
Rename the 'mode' parameter to 'status' in GET /invoices.
Fix the error handling in DELETE /invoices/{id}.
2016-06-20 17:56:33 +02:00
florian HENRY
d94953c4d7
FIX bug with PgSQL on GROUP BY missing column
2016-06-17 13:33:48 +02:00
Raphaël Doursenaud
eb54c3f8af
Fix #5350 date_pointoftax prevented creating invoices
2016-06-16 13:09:11 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
559c1aa010
Fix alignetment of title in some arrays
2016-06-06 16:37:18 +02:00
Laurent Destailleur
9c88eadbe4
Fix: button to generate invoice manually must be disabled if we reach
...
max number of generation.
2016-06-06 11:48:39 +02:00
Laurent Destailleur
a0458be943
Fix object not defined
2016-06-06 11:25:54 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
c59c86e648
Merge branch 'develop' of https://github.com/aschio/dolibarr into
...
develop
Conflicts:
htdocs/fourn/facture/list.php
2016-06-04 14:55:02 +02:00
Maxime Kohlhaas
bd2fe75d08
Fix menus in dashboard links
2016-06-04 14:45:03 +02:00
Laurent Destailleur
674164b71c
Add a better explanation on job generation
2016-06-04 14:30:05 +02:00
Laurent Destailleur
975d9357fa
FIX On recurring invoice, when generation is done manually from card,
...
counter of number of generation must be +1
2016-06-04 14:08:57 +02:00
Laurent Destailleur
448c394f2a
Fix date of recurrin invoice
2016-06-03 22:10:33 +02:00
Laurent Destailleur
2dcc578b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-30 00:52:59 +02:00
Laurent Destailleur
3ddf427ff1
FIX Legal issue for GB. Add hidden option for this.
2016-05-30 00:52:16 +02:00
Laurent Destailleur
0c6e8b626a
Fix var not initialized
2016-05-29 11:20:27 +02:00
Laurent Destailleur
acae888b3a
Fix phpunits
2016-05-17 23:38:07 +02:00
Juanjo Menent
fd6dbf5d1a
Fix Remove unused variables
2016-05-06 22:59:03 +02:00
Laurent Destailleur
6ffb45f5d8
FIX Missing param user on update()
2016-04-30 13:58:35 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/expedition/class/expedition.class.php
htdocs/index.php
2016-04-29 20:39:17 +02:00
Juanjo Menent
08a875b813
Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list
...
New add remain to pay column in invoice list
2016-04-29 12:00:53 +02:00
Laurent Destailleur
aa31a7e9c5
Finished list of template invoices
2016-04-27 20:09:55 +02:00
Laurent Destailleur
7608366e70
Fix pagination
2016-04-27 19:34:38 +02:00
Laurent Destailleur
9987c9b77a
Can sort on field of recurring invoices
2016-04-27 17:36:05 +02:00
Laurent Destailleur
60e693e9a4
Minor fixes on recurring invoices
2016-04-27 11:35:11 +02:00
Laurent Destailleur
bdb7fe8d29
Missing public note on recurring invoices
...
Can change position of lines in recurring invoices
2016-04-27 11:07:20 +02:00
Laurent Destailleur
78cda5dc07
Fix problem with code of reccuring invoices
2016-04-26 22:00:41 +02:00
Laurent Destailleur
c73f4e5d7b
FIX Project was lost when creating invoice from a template
...
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
Laurent Destailleur
ccdbf69cd5
Bette explanation on how to create an repeatable invoice
2016-04-24 18:11:19 +02:00
Maxime Kohlhaas
c5787a4bba
New add remain to pay column in invoice list (was present in previous versions)
2016-04-23 16:02:18 +02:00
Laurent Destailleur
5bfc65676c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
dd443fe7f5
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/localtax/quadri_detail.php
2016-04-21 02:42:43 +02:00
Marcos GarciÌa de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Maxime Kohlhaas
25dcca301f
Fix VAT amount on credit note was > 0 when manually entered
2016-04-12 09:47:35 +02:00
Laurent Destailleur
dd1f946afe
Clean dead code
2016-04-09 19:06:40 +02:00
Laurent Destailleur
104e34fe22
Fix css and missing link "go to list"
2016-04-08 03:40:23 +02:00
Laurent Destailleur
7a48ceb635
Uniformize code for mass actions
2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0
NEW Can select fields to show on list also for list of customer orders,
...
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0
Work on select fields for orders, invoices and shipments
2016-04-08 01:00:02 +02:00
Laurent Destailleur
1a1dc39a6b
Mark a duplicate function as deprecated
2016-04-06 14:53:14 +02:00
Ion Agorria
fbe0414a1f
Change FactureRec superclass CommonInvoice
2016-04-03 21:02:19 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos GarciÌa de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos GarciÌa de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos GarciÌa de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos GarciÌa de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos GarciÌa de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
ba4f5c8648
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34
Fix regression description line not visible
2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:15:23 +01:00
Laurent Destailleur
f0eb8ac794
Fix regression Product ref not visible
2016-03-19 19:13:27 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
08c5fd2e36
FIX #4809 - Duplicate functions with different content
2016-03-14 14:38:30 +01:00
Laurent Destailleur
543f5cef63
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
a5571b1040
NEW Show a badge with number of withdraw requests done on the withdraw
...
tab of invoice.
2016-03-13 01:20:54 +01:00
Laurent Destailleur
1b30c1adb4
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-12 20:49:38 +01:00
Laurent Destailleur
8b16a76936
Avoid duplicate translation
2016-03-11 10:59:28 +01:00
Laurent Destailleur
5bd5323c93
Finished to move the mergepdftool dedicated page into the generic "mass
...
actions" feature.
2016-03-10 12:11:11 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Laurent Destailleur
453466f23f
Fix draft invoice must be destroyed once converted into template
2016-03-03 21:14:20 +01:00
Laurent Destailleur
40144eee8d
NEW linked object can show now the recurring invoices with other linked
...
objects.
2016-03-03 13:38:16 +01:00
Laurent Destailleur
3cbeca26e7
NEW When creating a template invoice from a draft invoice, if there is
...
link to contract on draft invoice, link is kept on template invoice.
2016-03-03 13:16:46 +01:00
Laurent Destailleur
d842d05639
Fix bug in date compare
2016-03-03 12:31:29 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
21c7aacddb
Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to
...
provide backward compatibility with old behaviour.
2016-02-29 10:29:32 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
23f45c7b7e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
fmarcet
30d6aa0b96
FIX: Some filters are lost when paging
2016-02-26 13:14:23 +01:00
Laurent Destailleur
7567336680
FIX #4683
2016-02-26 10:51:06 +01:00
phf
d320aebe82
Fix muticurrency attributs not declared in class PropalLine
...
Fix fetch_lines of FactureFournisseur with multicurrency fields
2016-02-19 22:41:47 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
Laurent Destailleur
9796b1b268
Can select number of records into lists
2016-02-16 17:43:05 +01:00
Laurent Destailleur
9d418bca7f
Merge branch 'new_add_customer_multicurrency_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-16 15:06:39 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
phf
86c8998742
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351
Add fields to link recurring invoice lines with contract origin when it
...
comes from this.
2016-02-15 16:13:33 +01:00
Laurent Destailleur
d715345c82
Debug
2016-02-15 15:07:57 +01:00
Laurent Destailleur
38f7ac29d7
Show vat of lines on template invoices
2016-02-15 14:49:06 +01:00
Laurent Destailleur
23afb80c82
Can remove status recurring or not of template invoice
2016-02-15 14:42:05 +01:00
Laurent Destailleur
f1f5c48337
Uniformize code
2016-02-15 14:27:35 +01:00
Laurent Destailleur
d4c3258385
Fix missing field
...
Fix bad value for default value of next date
2016-02-15 07:36:45 +01:00
Laurent Destailleur
e8bc88fffe
Merge branch 'new_recurring_invoice' of
...
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:45:39 +01:00
phf
4f6289bea0
Fix test if frequency is defined to create or not by the cron
2016-02-12 16:09:50 +01:00
phf
428a7e7042
FIX remove comment, calcul next date for recurring invoice, increment nb_gen_done
2016-02-12 15:55:55 +01:00
phf
c4812abd62
Fix can update fields of facture rec
...
Fix create invoice from facture rec don't get all properties and add fk_account
2016-02-12 12:31:43 +01:00
phf
875e01aeee
New add recurrence fields on create form of invoice model
...
Fix missing fields in database about multicurrency
2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8
New add payment with multicurrency module
2016-02-10 23:16:38 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
d89daf9cd2
Work to move the merge pdf tool into the mass action combo of lists
2016-02-08 18:04:42 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
81aae30253
NEW Add a checkbox to select/unselect all lines on page that support
...
mass actions (like invoice list page)
2016-02-07 19:55:41 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
f4d04b8f26
FIX part of #4227
2016-02-03 02:41:07 +01:00
Laurent Destailleur
c28c8d5d18
Add more info into log
2016-02-02 16:32:47 +01:00
fmarcet
acc9879c7c
FIX: It doesn't check if there is enough stock to update the lines of orders/invoices
2016-02-01 13:05:14 +01:00
Laurent Destailleur
2d0c823ffe
Fix bad transaction level due to code of situation invoices
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179
Fix bad transaction level due to code of situation invoices
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2016-01-31 20:44:09 +01:00
Laurent Destailleur
0e1bb06d01
Fix duplicate set
2016-01-31 20:41:35 +01:00
Laurent Destailleur
6002adb04c
Fix bad transaction level due to code of situation invoices
2016-01-31 20:38:11 +01:00
phf
4baff7898d
FIX insert FactureLigne
...
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
2016-01-26 22:18:31 +01:00
phf
373225272b
FIX reorder the display of currency and rate on propal/order
...
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
2016-01-23 16:01:55 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
phf
a50a7366cb
FIX travis test
2016-01-13 14:04:48 +01:00
phf
d213fbae08
FIX invoice situation
2016-01-13 13:42:58 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Marcos GarciÌa de La Fuente
de1625b9de
FIX #4285 SQL query shown when accessing an unexisting invoice
2015-12-24 14:46:01 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
fec5f4e20b
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172
Fix init of situation_percent
2015-12-21 12:37:58 +01:00
Laurent Destailleur
ba9796a438
Merge pull request #4082 from atm-maxime/fix_situation_percent
...
Fix : situation percent should be 100 by default
2015-12-19 17:49:04 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
Laurent Destailleur
5eea1ce7d9
Fix several warnings
2015-12-17 19:37:24 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
philippe grand
30eb08151d
[Qual] Close database handler should be after Footer
2015-12-11 14:19:38 +01:00
Laurent Destailleur
939a36428c
Merge pull request #4156 from grandoc/develop
...
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
philippe grand
94fe00fe8d
[Qual] Uniformize code
2015-12-04 19:45:39 +01:00
Laurent Destailleur
a7d03af4af
Fix sending emails from mergepedtool was just doing wrong things.
2015-12-03 12:47:21 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
88e76dcf64
Fix utf8 encoded twice
2015-11-28 14:40:23 +01:00
Maxime Kohlhaas
da51a28766
Fix : situation percent should be 100 by default
2015-11-23 17:22:29 +01:00
Frédéric FRANCE
3d05b53a62
Typo
2015-11-22 19:08:38 +01:00
Laurent Destailleur
5e0b5cb75d
Merge pull request #4009 from frederic34/patch-7
...
Update list.php
2015-11-21 00:18:29 +01:00
Laurent Destailleur
401b2a7389
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/theme/md/style.css.php
2015-11-20 23:47:07 +01:00
Frédéric FRANCE
c647ad6425
Update list.php
2015-11-18 18:15:02 +01:00
Laurent Destailleur
fbd1d2360f
Comment
2015-11-18 13:42:38 +01:00
Frédéric FRANCE
0424a2bb3d
Update list.php
2015-11-16 16:27:37 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
74a4006a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Florian HENRY
019575d9ed
FIX : better fix for #3805
2015-11-12 13:21:35 +01:00
philippe grand
c712532bf6
[Qual] Uniformize code
2015-11-12 11:59:15 +01:00
Laurent Destailleur
3906cb79c5
NEW: Add parameter to add a link to use "date of invoice" in one click
...
when fille a payment card.
2015-11-07 23:46:07 +01:00
Sergio Sanchis Climent
6b01db5960
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee
Maintain origin_id and origin for copy document
...
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Christophe Battarel
80d2445540
FIX: bad stock valorisation
2015-11-05 17:00:22 +01:00
fmarcet
015dedc3ab
FIX: Show category selector if we have permission to view products or
...
services
2015-11-05 11:53:45 +01:00
Raphaël Doursenaud
c534f5bcd5
Fix #3805 Enhanced Facture::is_last_in_cycle()
2015-11-04 20:35:20 +01:00
Laurent Destailleur
a7795f25fc
Fix Must make a difference between a buying/cost price == '' (not
...
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Maxime Kohlhaas
ef2337a338
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
...
Conflicts:
htdocs/compta/facture/list.php
2015-10-22 14:41:58 +02:00
Frédéric FRANCE
5237a2afc7
Fix lost searchstatus on next page list
2015-10-20 17:45:24 +02:00
Maxime Kohlhaas
d79fb71987
FIX : search_status not used in mergefusiontool
2015-10-19 16:17:47 +02:00
Maxime Kohlhaas
5fb6705b5c
FIX : Search status not saved into list
2015-10-19 15:53:13 +02:00
Laurent Destailleur
81580f75b9
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Laurent Destailleur
420bfd8301
FIX Preview pages was not using correct style for ref
2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39
FIX The preview of PDF was never refreshed if PDF document was changed
2015-10-18 18:54:54 +02:00
Laurent Destailleur
3ce147ccc1
Use new architecture for quick search for the account area.
2015-10-17 02:41:09 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
918d9b7c18
Fix filter was lost if nothing found
2015-10-13 12:05:24 +02:00
Laurent Destailleur
7b7d27920d
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
Laurent Destailleur
a1d37f92cb
Several fix in CSS
2015-10-09 20:00:43 +02:00
Laurent Destailleur
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
Laurent Destailleur
1f742c7464
FIX Add a test to save life when ref of object (invoice ref, order ref,
...
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Laurent Destailleur
e3f225e038
FIX bad link into project box
2015-10-05 19:41:41 +02:00
Laurent Destailleur
f4b26285a2
Merge pull request #3649 from frederic34/patch-18
...
Lost search_status on next page button
2015-10-04 20:02:37 +02:00
Laurent Destailleur
474bf611ad
FIX product type must be defined before used for vat calculation.
2015-10-03 18:33:46 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Frédéric FRANCE
471e75f029
Lost search_status on next page button
2015-10-03 10:15:07 +02:00
Regis Houssin
65935c6603
Fix: copy/paste error
2015-10-02 10:46:32 +02:00
Regis Houssin
6f9b0e1053
Fix: sql error, status is an integer
2015-10-02 10:37:08 +02:00
Laurent Destailleur
b57c156b60
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modContrat.class.php
htdocs/fichinter/card.php
htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/security.lib.php
2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b
Add comment
2015-10-01 10:48:09 +02:00
arnaud
0b7305d21a
FIX facturestat bad sql when customer view is limited
2015-09-28 16:55:34 +02:00
Laurent Destailleur
fa9103fc97
FIX Bad title line in project view when using jmobile
2015-09-27 16:50:47 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
BENKE Charlie
8dcd6158e3
3.8 bad filtering caused by statut filter #3580
...
correction ported on 3.8 too, sorry for the bad step process
2015-09-26 10:15:42 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Juanjo Menent
93c0adf725
Merge pull request #3583 from GPCsolutions/clone
...
[Qual] Replaced deprecated dol_clone by native clone
2015-09-26 08:33:48 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
BENKE Charlie
b821878293
change > 0 by >= 0 as mentionned by raphael
2015-09-24 16:53:44 +02:00
BENKE Charlie
d30d91b165
fix issue #3579 : bad filtering caused by statut filter
2015-09-24 08:42:39 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Laurent Destailleur
7fd01d4aa3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-09 12:45:22 +02:00
Juanjo Menent
c13d2d202b
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2015-09-08 21:08:59 +02:00
Marcos GarciÌa de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos GarciÌa de La Fuente
3c5159f497
Created Facture::hasDelay function
2015-09-05 10:56:13 +02:00
Marcos GarciÌa de La Fuente
50184babb9
FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
...
Close #2893
2015-09-03 11:55:40 +02:00
Laurent Destailleur
c024578ca1
Fix bad link and remove a break
2015-09-02 19:41:54 +02:00
Laurent Destailleur
e3af0b90ec
Fix hidden feature to send remind by email
2015-09-02 18:09:29 +02:00
Laurent Destailleur
df3f29ee96
Fix hidden feature to send remind by email
2015-09-02 16:26:56 +02:00
Laurent Destailleur
c4fa4fc931
Fix hidden feature to send remind by email
2015-09-02 16:25:21 +02:00
Laurent Destailleur
39cbd7629f
Fix error message during import
2015-08-27 23:49:25 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51
Fix filter on date
2015-08-24 15:40:33 +02:00
Laurent Destailleur
241bf85da2
Fix parameter sendmassremind
2015-08-18 09:53:04 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
4b51fc80a6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2015-08-13 00:06:27 +02:00
Laurent Destailleur
b5730a24bc
Fix W3C
2015-08-12 22:28:30 +02:00
Marcos GarciÌa de La Fuente
7cb564586e
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
...
Close #3310
2015-08-09 13:52:02 +02:00
Maxime Kohlhaas
0afd27e3c2
New : % of evolution on stats
2015-08-07 13:29:11 +02:00
Laurent Destailleur
5ca6593a57
Fix serious deadlock feature. It was possible to link with no way to
...
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Marcos GarciÌa de La Fuente
d0b1652efd
Merge branch '3.5' into bug-3206
...
Conflicts:
ChangeLog
2015-07-19 11:16:10 +02:00
Marcos GarciÌa de La Fuente
4649cf7210
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
...
Close #3206
2015-07-18 19:40:48 +02:00
Marcos GarciÌa de La Fuente
7185cfeb84
Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
2015-07-18 14:48:59 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
251fedad48
NEW Can edit email template using WYSIWYG editor
2015-07-04 11:57:55 +02:00
Laurent Destailleur
45d27ae250
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:50:57 +02:00
Laurent Destailleur
e9b6a6a61e
NEW Add filter on status on invoice list
2015-07-04 10:50:41 +02:00
Laurent Destailleur
56560d9379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:49:01 +02:00
Laurent Destailleur
5fafb08f91
Uniformize code
2015-07-04 04:11:16 +02:00
Laurent Destailleur
196a745086
NEW Can filter proposal, orders or invoices with criteria "contain at
...
least one product with following tag"
2015-07-02 22:07:13 +02:00
Laurent Destailleur
a29ca43943
Prepare merge of merge tools and invoice list
2015-06-30 14:32:17 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
aspangaro
f9831f908e
Use print_liste_field_titre();
2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
8710065ca0
Merge pull request #3072 from atm-maximep/new_set_amount_for_withdraws
...
NEW : Set amount for withdraws requests
2015-06-21 11:52:23 +02:00
Laurent Destailleur
bbce287892
Fix: Pdf merge tool must see only pdf files
2015-06-19 16:05:04 +02:00
maxime peyrot
f99a127a57
NEW : Enter amount for withdraws requests
2015-06-19 13:45:14 +02:00
jfefe
745f0f7d7e
Fix crlf
2015-06-15 14:24:24 +02:00
Juanjo Menent
5edfef2525
Merge pull request #3006 from hregis/develop_productprice
...
Fix: disable hook calling
2015-06-12 21:38:14 +02:00
fmarcet
42b04102ba
New: Add due date filter on invoices lists
2015-06-11 12:40:16 +02:00
Regis Houssin
3fd7c26cf1
Fix: disable hook calling
2015-06-11 07:52:58 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
f5ec2c0605
Merge pull request #2911 from aspangaro/develop-md
...
NEW Forms are using the tab look, even in creation mode
2015-05-30 15:01:26 +02:00
aspangaro
432cf998fa
Fiche-rec: Forms are using the tab look, even in creation & add cancel button
2015-05-28 05:25:29 +02:00
aspangaro
5f5388a52a
Fix: wrong link
2015-05-27 07:19:10 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Maxime Kohlhaas
ff6708840d
Fix : facturestats was not filtering on invoice type
2015-05-22 09:23:28 +02:00
Francis Appels
40ef5737fc
Fix: SQL error in facturestats on no view rights
...
table alias sc must be available when user has no rights to view
customers. see where defenition line 80
2015-05-19 16:34:21 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Laurent Destailleur
5937cd7f70
NEW Forms are using the tab look, even in creation mode.
2015-05-13 17:53:25 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Laurent Destailleur
b3c9c3d91b
Merge pull request #2818 from GPCsolutions/htmlfixes
...
HTML fixes
2015-05-12 22:34:35 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
0d8641a073
[Qual] Use jQuery property instead of attribute to test and set checked
2015-05-12 14:51:30 +02:00
Juanjo Menent
97ad7ca88b
Code fixes
2015-05-09 14:23:26 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
971e23e006
Fix special_code was lost when updating line
2015-05-07 12:10:27 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
jfefe
5f62d2b13e
Add API class for invoice
2015-05-05 12:42:57 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
Juanjo Menent
b9b21bce8a
Merge pull request #2679 from marcosgdf/bug-1786-2
...
FIX [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-21 18:52:56 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Laurent Destailleur
9d1c609c4f
Merge pull request #2538 from marcosgdf/units
...
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-04-21 11:14:50 +02:00
Laurent Destailleur
94589b9935
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55
Uniformize feature between invoice and merging tool
2015-04-19 23:15:24 +02:00
Marcos GarciÌa de La Fuente
28b89a2dec
Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-19 18:58:56 +02:00
Marcos GarciÌa de La Fuente
270bca740c
Merge branch 'develop' into units
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2015-04-19 00:59:04 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Marcos GarciÌa de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
jfefe
22c3406498
Change title images for accountancy section
2015-04-18 23:17:47 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Florian HENRY
f2018b7946
fix bug #2652
2015-04-18 22:59:20 +02:00
Marcos GarciÌa de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos GarciÌa de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos GarciÌa de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Maxime Kohlhaas
e0af2feced
Fix : on impayees remain to pay did not include deposits
2015-04-18 18:06:02 +02:00
Florian HENRY
b7191a541c
All send email card works with model choice box
2015-04-18 17:15:36 +02:00
Laurent Destailleur
8ebad7a395
A serious rewrite of a lot of code to have the module batch number
...
stable.
2015-04-12 17:08:14 +02:00
Laurent Destailleur
2550c6b0af
Must exclude draft and abandon into default filter.
2015-04-06 19:22:58 +02:00
Laurent Destailleur
877e60c76f
Set default filter
2015-04-06 19:20:11 +02:00
Laurent Destailleur
02e8879d3b
NEW Feature to build a merged pdf with all unpaid invoice can work for
...
paid invoices.
2015-04-06 19:11:31 +02:00
Marcos GarciÌa de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
2bdca3d76b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-31 11:33:10 +02:00
Laurent Destailleur
2d50cc92b9
Differentiate title for customer and supplier orders/invoices.
2015-03-31 11:32:47 +02:00
Marcos GarciÌa de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
Marcos GarciÌa de La Fuente
3d50b41b8e
Reverted $rowid instead of $id property
2015-03-23 01:40:33 +01:00
Marcos GarciÌa de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Marcos GarciÌa de La Fuente
efb9f7f4fd
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
2015-03-15 18:07:30 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Marcos GarciÌa de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
Marcos GarciÌa de La Fuente
4c08d34bb5
Standardized $rowid as property
2015-03-04 10:37:46 +01:00
Marcos GarciÌa de La Fuente
ad72425291
Moved some variables from FactureLigne to CommonInvoiceLine
2015-03-04 10:37:43 +01:00
Marcos GarciÌa de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
b888a04af9
Reduce a lot of duplicate code. Move all tables of extrafields setup
...
into a tpl file.
2015-02-28 20:14:26 +01:00
Laurent Destailleur
8e26c71fa7
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 04:59:27 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
fe7889e266
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
phf
9eed66d998
[CORE] FIX : Travis phptest (#incoterm).
2015-02-23 11:46:39 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
81130634d3
[CORE] intégration de incoterm sur les différentes class (#incoterm).
2015-02-23 09:16:14 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos GarciÌa de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos GarciÌa de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos GarciÌa de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos GarciÌa de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Marcos GarciÌa de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Laurent Destailleur
21f72c7594
Fix regression
2015-01-31 17:10:19 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
3554624537
Fix: A method must not change value of original property.
2015-01-18 23:32:13 +01:00
Laurent Destailleur
47baf232d4
Fix: A method must not change value of original property.
2015-01-18 23:02:53 +01:00
Laurent Destailleur
f96fdc7d0a
Regression solved
2015-01-18 21:04:39 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Laurent Destailleur
ff65035aee
Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1717
Conflicts:
ChangeLog
2015-01-18 15:12:00 +01:00
Frédéric FRANCE
6237f68e74
Update facture.class.php
2015-01-18 01:07:32 +01:00
Frédéric FRANCE
f763f23614
Update facture.class.php
2015-01-18 00:57:03 +01:00
Marcos GarciÌa de La Fuente
003aa5ee44
Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount
2015-01-17 19:41:31 +01:00
Marcos GarciÌa de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Marcos GarciÌa de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +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
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +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
Laurent Destailleur
63f2bfed24
Fixed: Maxi debug of withdrawal module.
2014-12-09 11:19:16 +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
01209ff844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Laurent Destailleur
b9ea7d4d13
Fix: Stock decrease from POS
2014-11-29 17:38:12 +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
Frédéric FRANCE
bc58641828
Update Invoice Preview to be like order and propal preview
2014-11-27 22:07:18 +01:00
Frédéric FRANCE
755732ce58
Update apercu.php
2014-11-26 20:35:08 +01:00
Frédéric FRANCE
96e0ecd1a7
Update Invoice Preview
2014-11-26 20:07:47 +01:00
Francis Appels
b1a4b8e7d0
Fix: [ bug #1624 ] POS set buy price for margin
...
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
2014-11-25 21:20:13 +01:00
Frédéric FRANCE
339415034e
Update /compta/facture/impayees.php
2014-11-23 17:44:45 +01:00
Frédéric FRANCE
ccff0f0952
Update /compta/facture/list.php
2014-11-23 17:44:41 +01:00
Frédéric FRANCE
0ea40c155e
Update /compta/facture/impayees.php
2014-11-23 09:57:21 +01:00
Frédéric FRANCE
fef3cfbe81
Update /compta/facture/list.php
2014-11-23 09:55:13 +01:00
Laurent Destailleur
d8767bfbae
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-22 16:03:09 +01:00
Laurent Destailleur
d6f47227fe
Fixed: [ bug #1646 ] Can't list unpaid invoices
2014-11-22 15:09:54 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Christophe Battarel
7ed496d7d9
FIX: copy extrafields when creating order from propale and creating
...
invoice from order
2014-11-12 17:51:26 +01:00
Laurent Destailleur
6fd89c4b41
Fix: Missing translation
2014-11-08 20:05:56 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
Laurent Destailleur
6f77dc83c4
Qual: Uniformize code and fix a ton of bugs.
2014-10-27 03:24:45 +01:00
Laurent Destailleur
7988532e4e
Fix: Bad closing tab on preview pages.
2014-10-17 12:56:54 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Marcos GarciÌa de La Fuente
f7a44347cb
Lowecased booleans to fit with PSR-2 specification.
2014-10-12 00:23:19 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
d518278166
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/fiche.php
htdocs/compta/facture/class/facture.class.php
2014-10-03 19:17:28 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41: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
Christophe Battarel
d1868b643e
FIX: clone line extrafields value on quote, order and invoice
2014-09-24 11:47:34 +02:00
Laurent Destailleur
74cba062b4
Add a TODO to explain why we keep some extends into class.
...
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +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
4ff6b1ab1a
Merge branch 'KreizIT-predefined' into develop
...
Conflicts:
ChangeLog
2014-09-22 23:57:12 +02:00
Marcos GarciÌa de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
Marcos GarciÌ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
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Maxime Kohlhaas
3611ac673f
Add clear search icon on invoices list
2014-09-17 17:58:11 +02:00
Maxime Kohlhaas
9cc01635aa
Add clear search icon on unpaid invoices list
2014-09-17 17:56:53 +02:00
Marcos GarciÌ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
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Marcos GarciÌa de La Fuente
949ae2f160
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
2014-09-14 13:09:31 +02:00
Cedric
86d8870939
Add create button on predefined invoice details
...
Check invoice creation right
2014-09-11 17:33:47 +02:00
Laurent Destailleur
562c47dd62
Fix: colspan too low.
2014-09-08 12:00:25 +02:00
Laurent Destailleur
395209a5db
Fix: Reason to have button greyed is wrong
...
Conflicts:
htdocs/compta/facture/prelevement.php
2014-09-04 15:17:05 +02:00
Laurent Destailleur
4333e96ecb
Fix: Reason to have button greyed is wrong
2014-09-04 15:14:30 +02:00
Laurent Destailleur
86d91ff698
Fix: Setting new property of object must be done only after all database
...
actions are ok (and if ok).
2014-08-19 15:03:55 +02:00
Laurent Destailleur
abb845b579
Merge pull request #1813 from atm-maxime/mkoevols
...
Add payment mode in invoice list
2014-08-14 00:21:34 +02:00
Florian HENRY
eca9408c91
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-12 12:37:31 +02:00
Maxime Kohlhaas
c207daa18c
Revert invoice list
2014-08-11 10:07:09 +02:00
Maxime Kohlhaas
885c26f27b
Ajout du mode de règlement dans la liste des factures et dans la liste des impayées
2014-08-07 13:50:25 +02:00
KreizIT
c94c0699d8
Fix : [ bug #1549 ] Itïs not possible add ExtraFields
2014-08-06 17:38:44 +02:00
Laurent Destailleur
164c9e0b75
New: Can defined a bcc for each email type.
2014-08-05 09:28:58 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2014-08-04 22:18:30 +02:00
Laurent Destailleur
4e8ec8e598
Revert "Add Reduction value in pdf"
...
This reverts commit 0b5707c1cf
2014-08-04 18:36:18 +02:00
Florian HENRY
44f06bef22
Unpaid invoice launch fusion PDF action even if it is only search (with
...
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +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
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
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
Florian HENRY
cf63f1a40d
Remane contract ref_ext to ref_supplier
2014-07-21 08:36:59 +02:00
Marcos GarciÌa de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
nicoplh
2cfc5f10a8
Update impayees.php
...
remove useless type alpha.
2014-07-18 14:47:23 +02:00
nicoplh
25a591bd03
Update impayees.php
...
Add column ref.Client with search module.
2014-07-17 16:21:23 +02:00
Marcos GarciÌ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
KreizIT
fc61cc9bfa
Refactor: BILL_* and LINEBILL_* trigger
2014-07-11 14:36:13 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
frederic34
516632e41d
Select bank account for customer order
2014-07-07 17:59:04 +02:00
Juanjo Menent
4063260cc8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-04 16:16:52 +02:00
Juanjo Menent
fdb938af0f
[ task #1063 ] Allow edit localtaxes rate for thirds. Remove country
...
condition
2014-07-04 13:44:26 +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
416577a6aa
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with
...
invoices
2014-07-04 11:41:43 +02:00
Marcos GarciÌa de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos GarciÌ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
Laurent Destailleur
14de1d66c0
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-29 23:56:23 +02:00
Laurent Destailleur
bb2e843fc9
More visible information on predefined invoices.
2014-06-29 14:03:14 +02:00
Laurent Destailleur
198a8d40f7
Fix: Missing translation
2014-06-29 13:53:07 +02:00
Cedric
ee91f4a3f7
FIX : #1477 , #1478 , #1479
2014-06-25 13:37:55 +02:00
Maxime Kohlhaas
19a3194b02
Fix : duedate was not auto calculated + move calculation function to common invoice class
2014-06-14 12:53:02 +02:00
Marcos GarciÌa de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos GarciÌa de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos GarciÌa de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos GarciÌ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 GarciÌa de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +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
Laurent Destailleur
8e7b310fb6
Fix: [ bug #1400 ] Silent Warning create a draft invoice
2014-05-25 05:01:14 +02:00
Regis Houssin
b39627288e
Fix: missing hookmanager global
2014-05-21 11:48:45 +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
f621f7eb32
Fix: The rounding mode is now forced when provided explicitly and no
...
more by default (we keep data intact when no mode provided).
2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
...
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Laurent Destailleur
3393b1c5fb
Fix: Date of invoice is set to current date when cloning. // TODO Best
...
is to ask date into confirm box.
2014-05-12 12:15:54 +02:00
Alexis Algoud
f13c146908
Fix page numerotation as in company list
2014-05-12 11:00:58 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
3fd7e18c08
Fix: Bad translation into title of action buttons
2014-05-10 17:00:55 +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
12aa541db4
Clean code
2014-05-02 17:58:26 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
880f77b7e1
Fix: Preview feature
2014-04-30 13:50:25 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
f891e1ac42
Fix: use currency into price function
2014-04-02 00:01:06 +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
88a4af394c
Removed dead or useless code.
2014-03-29 14:12:01 +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
Florian Henry
649f535d56
delete extrafield on delete invoice
2014-03-15 19:49:21 +01:00
Laurent Destailleur
ad23c88f1a
Merge pull request #1481 from atm-maxime/mko672
...
Add : Stock can be mandatory to use a product
2014-03-15 17:29:31 +01:00
Maxime Kohlhaas
1911f6fcdc
Task 672 : add stock limitation on shipment + translation
2014-03-15 14:59:27 +01:00
Maxime Kohlhaas
b6a2fa61c8
Task 672 : only for product not services
2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8
Task 672 : Prevent use of product not available
2014-03-15 12:45:56 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
Florian Henry
3f6b319d41
Fix deposit invoice
2014-03-14 23:42:45 +01:00
Laurent Destailleur
1b85f83dbb
Merge pull request #1466 from marcosgdf/minor
...
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Marcos GarciÌa de La Fuente
0a603777ae
Added missing spacing
2014-03-11 11:27:06 +01:00
Marcos GarciÌa de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
270eaf7aca
Qual: Uniformize search date for lists.
2014-03-06 17:02:27 +01:00
Marcos GarciÌa de La Fuente
0eedadd7f2
Replacing invoice integer types with Facture constants
2014-02-26 01:09:22 +01:00
Marcos GarciÌa de La Fuente
ad928cb443
Replacing invoice integer types with Facture constants
2014-02-26 00:56:36 +01:00
Marcos GarciÌa de La Fuente
e90f068e3b
Documented invoice types
2014-02-25 01:10:18 +01:00
Laurent Destailleur
f537f62aea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/impayees.php
2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743
New: Sending remind of unpayed invoices by emails (need tester)
2014-02-24 16:50:36 +01:00
Laurent Destailleur
37d2d990af
Add comment into doc
2014-02-24 10:17:56 +01:00
Florian Henry
e3ca6cf3d3
Fix phpunit code siffer errors
2014-02-23 10:47:51 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +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
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +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
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 09:43:21 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
simnandez
a1e0d84e37
Fix: Lost stats filters into year selection
2013-12-19 15:43:22 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
dc1ccbfae8
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:35:13 +01:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Alexis Algoud
895f5452b4
In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted.
...
Ex in agefodd module:
$obj_link=new Propal($db);
$obj_link->id=$agf->propalid;
$resultdel=$obj_link->delete($user);
To prevent misuse of the function, the reference is not considered given
2013-12-11 15:14:29 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
Laurent Destailleur
5e246107a7
Doxygen
2013-11-04 16:31:12 +01:00
Laurent Destailleur
b2df689669
Merge pull request #1274 from FHenry/3.4
...
USe good status icon for thirdparty ActivityCeased
2013-11-03 13:18:37 -08:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Florian Henry
6aea0bf7a1
Fix [ bug #1105 ] Searching Boxes other search option
2013-11-02 12:49:37 +01:00
Laurent Destailleur
c81bb60384
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Florian Henry
17df92c654
Fix [ bug #1116 ] Silent Warning when validating a customer invoice
...
[PostgreSQL]
2013-10-26 16:01:02 +02:00
Florian Henry
bdcbd4ee42
Fix list propal and invoice to display customer ref if option is set
2013-10-22 12:47:26 +02:00
Laurent Destailleur
e5bc7d29d0
Fix: Validation of contract lose the new ref into trigger.
...
Fix: Validation of contract was not using transaction
Fix: Validation of contract did not renamed uploaded directory.
2013-10-18 10:17:06 +02:00
Laurent Destailleur
47a9837046
Uniformize ref_customer into list
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
2013-10-07 21:58:12 +02:00
Laurent Destailleur
3fde695c94
Qual: Uniformise name of include files we use to share common code found
...
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
a1e7333613
Fix: bug preventing creation of predefined invoice.
...
Also added phpunit test to detect it if it occurs again.
2013-09-16 13:42:42 +02:00
Laurent Destailleur
16e2de1d7b
Merge pull request #1228 from csalvador/develop
...
Added a field to group by to avoid error with mysql strict mode
2013-09-12 02:06:31 -07:00
simnandez
b36dc08e00
Remove unnecessary code
2013-09-12 09:59:23 +02:00
simnandez
c1c423dcac
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 17:49:36 +02:00
simnandez
634f70a74d
New: [ task #1060 ] Register fields localtax(1|2)_type into details
...
tables. Invoices
2013-09-10 17:07:38 +02:00
Cédric Salvador
13e86e9b0d
Added a field to group by to avoid error with mysql strict mode
2013-09-10 16:45:05 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828
Fixed typos
2013-09-05 18:06:51 +02:00
Laurent Destailleur
657c4d6e90
Fix: Fix graph for product distribution.
...
Add limit and add entry other.
2013-08-27 11:54:07 +02: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
simnandez
fd759ade76
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:04:10 +02:00
simnandez
c242d66530
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:03:16 +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
59c1f54d68
New: Enhance DolGraph class for pie charts.
2013-08-09 19:19:48 +02:00
Laurent Destailleur
23516a466c
Fix: Pb with predefined invoices
2013-08-06 23:56:13 +02:00
Laurent Destailleur
7438809ab5
Make predefined invoice feature easier to use.
2013-08-06 23:55:17 +02:00
Laurent Destailleur
acf3db8512
Fix: Pb with predefined invoices
2013-08-06 23:50:12 +02:00
Laurent Destailleur
7a8d28f135
Several fix for last pull request:
...
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
2013-08-06 19:12:26 +02:00
Laurent Destailleur
7a17d52dad
Merge pull request #1157 from PaulPoulain/961-develop
...
T961-develop: Put the private note in the bill list
2013-08-06 09:44:28 -07:00
lalaina rasamoelina
a8ba4e1861
T961-develop: Put the private note in the bill list
...
In the invoice list, if there are the private notes,we print them and we can edit them
htdocs/compta/facture/liste.php
2013-08-06 16:36:16 +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
Laurent Destailleur
db8af86111
Fix: W3C
2013-07-30 18:36:13 +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
3c6b1f17d1
Fix: print of a function that already contains the print.
2013-07-27 14:10:57 +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
55fc3165ba
New: Can filter on status
2013-07-26 11:27:56 +02:00
Laurent Destailleur
9c88c03860
Fix: missing css class on tr
2013-07-25 13:56:07 +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
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Laurent Destailleur
09fd904e76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/ecm/index.php
2013-07-19 14:01:47 +02:00
Laurent Destailleur
75214a6b70
New: Add graphical box for turnover and proposal
2013-07-18 16:53:31 +02:00
Laurent Destailleur
d5ca2f9f40
Fix: forged select for stats where wrong when filtering on a thirdparty
...
Conflicts:
htdocs/compta/facture/class/facturestats.class.php
2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26
Fix: forged select for stats where wrong when filtering on a thirdparty
2013-07-18 15:25:25 +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
5fb707f918
Fix: Restore disappeared feature
2013-07-14 21:02:00 +02:00
Laurent Destailleur
446cc162cd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/compta/facture/impayees.php
2013-07-14 20:33:54 +02:00
Laurent Destailleur
dc5ad1a0f3
Fix: Total missing
2013-07-14 20:29:07 +02:00
Laurent Destailleur
f009100126
Fix: Bad column
2013-07-12 16:51:31 +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
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
56676c925f
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-01 02:10:57 +02:00
Laurent Destailleur
59c97afeed
Fix: Bad calculation. Missing global.
2013-07-01 02:10:22 +02:00
Laurent Destailleur
c37527a8a0
Fix: No currency into lists.
2013-07-01 01:59:07 +02:00
Laurent Destailleur
d8883dba7f
New: Add new graphical boxes (customer invoices per month).
2013-06-28 19:19:18 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +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
f2e2815cc1
Merge branch 'develop' into dev_projecthtmlform
2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12
Start normalize project module : create html.formprojet.class.php with
...
selec_project
2013-06-14 22:33:01 +02:00
Laurent Destailleur
499440be16
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-14 01:29:43 +02:00
Florian Henry
1ecc24216f
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:07:50 +02:00
Florian Henry
fb0a99cb55
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:05:19 +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
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
Marcos GarciÌa
cf6bfcc9c4
Missing translations
2013-06-08 20:31:39 +02:00
Marcos GarciÌa
3cff899b44
Removed debug message and wrong translation key
2013-06-08 20:01:51 +02:00
Marcos GarciÌa
532c56002d
Entities problem with error message in predefined invoice creation
2013-06-08 19:07:13 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Florian Henry
7c56da05b8
Add hook on propal/order/incoive list
2013-05-28 18:35:15 +02:00
Laurent Destailleur
6db07ac2d8
Fix: Several bugs into filter on statistics pages.
2013-05-20 19:24:27 +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 GarciÌ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
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
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
b67faf1eb1
Fix PgSQL
2013-04-26 13:01:42 +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
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
fhenry
cd7f94d515
[ bug #849 ] BUG PGSQL
2013-04-24 23:19:01 +02:00
fhenry
23a7aae084
[ bug #841 ] Erreur compta/index
2013-04-23 14:48:34 +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
Laurent Destailleur
dd13c334c7
New: Compatibility with jmobile
2013-04-20 20:30:18 +02:00
fhenry
880659af3a
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-04-20 02:49:16 +02:00
Laurent Destailleur
162ccf68b6
Merge pull request #841 from FHenry/develop
...
fix [ bug #825 ] User first name not visible into users->perms
2013-04-19 17:21:16 -07: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
Regis Houssin
45300ccdd8
Fix: no result with a number with a comma
2013-04-19 09:55:22 +02:00
Regis Houssin
3e9a8677c6
Fix: no result with a number with a comma
2013-04-19 09:48:55 +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
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
fhenry
dcd960a957
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
2013-04-05 11:46:09 +02:00
Laurent Destailleur
d8a86453e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136
Optimize size of graph
2013-04-04 21:13:51 +02:00
Laurent Destailleur
607ebbfe8b
Qual: Replace tab with div
2013-04-04 19:42:21 +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
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
jfefe
013eac1147
Better error management when add/update extrafield
...
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
Laurent Destailleur
75c15ee9a1
New: Revenue stamps works for invoices
2013-03-25 13:04:03 +01:00
Laurent Destailleur
4b1c9c1a0d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-25 12:29:30 +01:00
Laurent Destailleur
dc0c1a2c85
Fix: [ bug #729 ] incorrect unpaid invoice list
2013-03-25 12:20:24 +01: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
Laurent Destailleur
e1bf659db5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-11 16:49:37 +01:00
Laurent Destailleur
b4299ad583
Fix: Select of user
2013-03-11 14:51:19 +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
Laurent Destailleur
0fe91796ef
New: [ task #696 ] Remove "new stdClass();" when possible
2013-03-08 15:52:23 +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
jfefe
4314d4c7fe
Add admin screen for extrafields on customer invoices
2013-03-06 03:50:41 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +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
simnandez
ad3645f7f4
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-25 11:37:30 +01:00
simnandez
03d6903248
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-24 12:53:42 +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
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +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
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
0f5a80a40f
Fix: Bad var name
2013-01-07 00:14:38 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Laurent Destailleur
a1b0fbcc2c
Fix: [ bug #659 ] Comment in recurrent invoices is not stored
...
Fix: Missing payment mode
2012-12-30 14:14:52 +01:00
Laurent Destailleur
f9700dc941
Fix: [ bug #651 ] FusionPDF created files cannot be deleted
2012-12-27 14:37:15 +01:00
Laurent Destailleur
135a622076
Fix: Bad parameter
2012-11-03 15:35:11 +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
153997432f
Fix: Several fix.
...
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
2012-10-13 17:00:38 +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
84089f3e53
Fix: bas tabs when socid provided into stats pages
2012-09-21 00:28:11 +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
Laurent Destailleur
832a472325
Little clean of page
2012-09-16 22:45:58 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +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
Laurent Destailleur
643d6ff3f9
Fix: Debug feature predefined invoices
2012-09-14 10:09:56 +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
Marcos GarciÌa
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +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
f322ec50ed
New: [ task #498 ] - final part
2012-08-25 15:21:34 +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 GarciÌa
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos GarciÌa
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos GarciÌa
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Marcos GarciÌa
d32ed9b39c
Missing copyright
2012-08-18 18:49:18 +02:00
Marcos GarciÌ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
3468787a29
Fix: best view
2012-08-16 20:20:23 +02:00
Regis Houssin
d03eb5af4a
New: add total vat field
2012-08-16 20:11:48 +02:00
Regis Houssin
97474bf77f
Fix: strict mode safari
2012-08-16 19:18:24 +02:00
Marcos GarciÌa
37332ee040
Forgot to rename the variable
2012-08-15 01:20:53 +02:00
Marcos GarciÌa
764c0a50cd
Fixed more average amount graph stats. They include:
...
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense
2012-08-14 21:23:14 +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
e53ae6eea2
Fix: W3C
2012-08-05 21:59:45 +02:00
Laurent Destailleur
e53e847083
Qual: Uniformize code
2012-08-05 14:37:45 +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 GarciÌ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
Regis Houssin
28851b46c4
Fix: remove duplicate code
2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74
Fix: replace with new event message system
2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95
Fix: broken event message
2012-07-29 15:47:24 +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
Regis Houssin
9cdba5bb61
Fix: try another method more clean and can be deployed on any type of
...
message
2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3
Merge pull request #272 from marcosgdf/backtolist-links
...
Created BackToList links
2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10
Fix: try to use another method for messages
2012-07-28 22:07:27 +02:00
Marcos GarciÌa
2eeaad1352
BackToList links in Financial section
2012-07-28 21:22:59 +02:00
Regis Houssin
b2317fd3ee
Fix: external user confidentiality
2012-07-26 18:11:06 +02:00
Regis Houssin
2035eb0b14
Fix: strict mode mini
2012-07-23 21:40:34 +02:00
Regis Houssin
eba0db736e
Fix: try to use $mesgs (array) for stock all messages and
...
$_SESSION['dol_message'] for specific message when a page is reloading
2012-07-23 21:31:10 +02:00
Regis Houssin
d5ff308992
Fix: declare $mesg and $mesgs in main.inc.php
...
Fix: strict mode be back
2012-07-23 20:52:55 +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
b3f99e946f
Merge pull request #234 from defrance69/patch-6
...
Update develop
2012-06-29 03:38:26 -07:00
Laurent Destailleur
f2de43b771
New: Can filter list of proposal, order or invoice on sales
...
representative
2012-06-23 20:39:20 +02:00
Laurent Destailleur
9e4af7c5a7
Fix: group by not complete
2012-06-23 20:29:35 +02:00
BENKE Charles
63493a6d1f
Update develop
2012-06-21 12:30:22 +03: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
Laurent Destailleur
e6cd400bc3
Qual: List of elements must be into a page called "list.php".
2012-06-09 19:16:31 +02:00
Regis Houssin
274734b828
Fix: stock message in session and reload the page for avoid url problem
...
with jQuery fileupload
2012-05-31 21:11:26 +02:00
Laurent Destailleur
c2db3265ec
Fix: Regression with quot management. Try a better fix.
2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac
Fix: can't delete a files with quote
2012-05-30 08:30:25 +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
3fc3292142
Fix: delete of documents is done by page of element, not by the view
...
wrapper.
2012-05-29 23:50:13 +02:00
Laurent Destailleur
7213ae09fe
Checkstyle
2012-05-29 00:08:00 +02:00
Regis Houssin
516be43404
Fix: jquery fileupload broken feature
2012-05-25 20:56:05 +02:00
Laurent Destailleur
eca1223949
Indent
2012-05-24 16:58:14 +02:00
Laurent Destailleur
6b2faf02d9
Checkstyle
2012-05-23 23:34:00 +02:00
Cédric Salvador
673f57edae
Fix: error in syslog call
2012-05-14 11:46:42 +02:00
Laurent Destailleur
e9fb0f427c
New: Add customer invoice ref on invoices
2012-05-06 02:27:09 +02:00
Regis Houssin
1b350fafd1
Fix: missing entity field in contract
...
Fix: multicompany compatibility
2012-05-03 18:42:46 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
Laurent Destailleur
ff06360071
Fix: Overwritting code is not role of a template but of a module.
...
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
2012-04-28 17:01:25 +02:00
Grand Philippe
b34ecf757d
to use personal contacts.tpl within personal theme, and fix error for js file
2012-04-27 11:40:11 +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
808c4b5732
New: testing a new method to avoid reloading the page
2012-03-18 14:06:55 +01:00
Laurent Destailleur
a7a55645d8
Fix: Some fix when using fckeditor with notes.
...
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
2012-03-18 00:59:24 +01:00
Laurent Destailleur
d87f14b7ce
Fix: minor change
2012-03-17 23:38:44 +01:00
Regis Houssin
bd4b24f1eb
Fix: add <br> for default note tab
2012-03-17 18:27:31 +01:00
Regis Houssin
815ee68f8f
Fix: use div instead table
2012-03-17 18:10:59 +01:00
Regis Houssin
281c6b7f2a
New: sharing code of contact and note tabs
2012-03-17 16:05:58 +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
Regis Houssin
150f3ecfe3
Fix: move method in common class
2012-03-13 19:24:11 +01:00
Laurent Destailleur
b5fc41fadc
Fix: Removed a lot of checkstyle warnings
2012-03-11 22:08:46 +01:00
Regis Houssin
3871f3a6dd
Fix: missing contacts with order to invoice
2012-03-11 11:57:15 +01:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
Laurent Destailleur
1645ddbe47
Sec: Sanitize all input for ids.
2012-02-27 22:26:22 +01:00
Regis Houssin
f4bab2f6de
Fix: avoid warning and deprecated variable
2012-02-27 08:47:25 +01:00
Laurent Destailleur
41380d1958
Fix: Removed warning
2012-02-26 16:46:31 +01:00
Regis Houssin
ea83e474dc
New: add possibility to linked other objects from external modules
2012-02-22 01:19:05 +08:00
Laurent Destailleur
b8a61e73a0
New: Add product_label into substitution tags for ODT.
2012-02-20 23:58:36 +01:00
Laurent Destailleur
52e2253e20
Fix: A delete must always be done on a fully loaded object.
2012-02-19 18:39:41 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Laurent Destailleur
61b6ec4f99
Better title
2012-02-18 03:29:20 +01:00
Laurent Destailleur
a829b10190
Fix: Autoselect current year if not defined
2012-02-16 19:08:04 +01:00
Regis Houssin
c3e245d24e
Fix: start triggers before delete objects
2012-02-15 15:16:33 +01:00
Laurent Destailleur
e178077e1e
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/compta/bank/ligne.php
2012-02-15 12:22:18 +01:00
Regis Houssin
6f3f1204fe
Fix: delete linked object in propal delete function and uniformize code
2012-02-13 18:27:42 +01:00
Laurent Destailleur
cfaf1f0813
New: Can add tabs on statistics views.
2012-02-12 23:29:31 +01:00
Regis Houssin
cd3452d71d
Fix: multicompany sharings and uniformize code
2012-02-11 10:18:09 +01:00
Laurent Destailleur
d9cd816b3c
Qual: Merge month.php and index.php page
...
Prepare for adding statistics page into new tabs.
2012-02-11 00:11:49 +01:00
Laurent Destailleur
186258410e
New: Add option to clean orphelins files into repair page
2012-02-08 16:41:06 +01:00
Laurent Destailleur
104a4532b9
Fix: miscellaneous not initialized vars
2012-02-07 18:48:50 +01:00
Regis Houssin
6a43a517f1
Fix: add deleteObjectLinked function
2012-02-07 16:47:46 +01:00
Laurent Destailleur
6cb0685b6f
Qual: Uniformize hook names. All hooks to add information on
...
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
2012-02-06 17:18:19 +01:00
Laurent Destailleur
866e8ac556
First change to prepare usage of native PHP functions for date instead
...
of adodb-time library.
2012-02-05 15:13:31 +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
Laurent Destailleur
f3a966a313
Fix: Missing name
2012-01-29 23:24:47 +01:00
Laurent Destailleur
82e5aad8f1
Fix: Usage of not defined var
2012-01-26 13:54:17 +01:00
Laurent Destailleur
a57295cc73
Qual: Add phpunit test before working on different rounding modes
2012-01-11 16:35:12 +01:00
Laurent Destailleur
5fc760d318
Doxygen
2012-01-10 09:57:16 +01:00
Laurent Destailleur
9e065b2395
New: Dolgraph function works with jflot (use DOL_MAIN_GRAPH=artichow to
...
use old libraries)
2012-01-07 20:56:52 +01:00
Laurent Destailleur
82fd755919
Look: Increase field size
2012-01-02 14:26:47 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00
Laurent Destailleur
cda132ea8c
Qual: Some change to have graph lib able to use img disk generation
...
libraries like javascript libraries.
2011-12-17 15:55:49 +01:00
Juanjo Menent
71979a8c86
Qual: Uniformize code
2011-12-16 16:31:18 +01:00
Regis Houssin
a5fc434770
Fix: remove unused parameters
...
Fix: use dol_clone instead fetch
2011-12-12 14:04:03 +01:00
Laurent Destailleur
ebea7f6c97
Fix: fix not initialized variables
2011-12-05 18:36:54 +01:00
Laurent Destailleur
eee21dd644
Fix: Missing deposits
2011-12-03 15:30:58 +01:00
Laurent Destailleur
0c2451e4fa
Doxygen
2011-12-03 15:30:40 +01:00
Laurent Destailleur
010964ad54
Fix: Warning always visible
2011-12-03 15:21:33 +01:00
Laurent Destailleur
7f3c336b7b
Clean invoice class and enhance phpunit tests
2011-12-03 15:12:18 +01:00
Laurent Destailleur
56a0e26465
Fix: Removed tons of warnings
2011-12-01 17:09:01 +01:00
Laurent Destailleur
35425fe1c4
Doxygen
2011-11-23 19:58:03 +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
31f198fa79
Clean invoice class from deprecated fields.
...
Enhance initAsSpeciment function to contains all kind of lines.
2011-11-23 13:39:55 +01:00
Laurent Destailleur
1770a46519
Qual: Removed tons of warning
2011-11-22 14:00:03 +01:00
Laurent Destailleur
ded3e4efad
Fix: pgsql compatibility
2011-11-22 02:15:58 +01:00
Laurent Destailleur
3699f13454
Fix: [ bug #233 ] Delete invoice problem with a discount
2011-11-19 19:05:33 +01:00
Laurent Destailleur
51d30c41a7
Fix: Correct sign
2011-11-18 13:08:51 +01:00
Laurent Destailleur
f60b664c16
Fix: Correct sign on line
2011-11-18 02:16:35 +01:00
Laurent Destailleur
3d01d77427
New: Stock change on invoice validation support all warehouse into point
...
of sale module
2011-11-15 20:27:32 +01:00
Laurent Destailleur
5dc660af46
Fix: Stock sign for credit note must be reverted
2011-11-14 17:47:45 +01:00
Laurent Destailleur
12963265d7
Add confirm message when going back to draft
2011-11-14 16:23:59 +01:00
Laurent Destailleur
7384096d56
Enhance doc for stock movement
2011-11-14 15:46:44 +01:00
Laurent Destailleur
8cdbc2151c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2011-11-14 01:38:33 +01:00
Laurent Destailleur
9a43c8a14f
Qual: Removed useless parameter
2011-11-12 12:59:06 +01:00
Regis Houssin
87d7badd53
Works on merge pdf with encryption
2011-11-12 09:23:54 +01:00
Regis Houssin
a7a85ac513
Fix: uniform code
2011-11-11 16:10:50 +01:00
Laurent Destailleur
10961fb2c9
New: Can choose warehouse for stock change on supplier approbation or
...
supplier invoice validation
2011-11-09 22:10:58 +01:00
Laurent Destailleur
253084feb3
New: Can choose warehouse for invoice validation
2011-11-09 14:31:43 +01:00
Laurent Destailleur
72c0a15f56
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/commande/fiche.php
htdocs/core/class/commonobject.class.php
htdocs/product/fiche.php
2011-11-09 12:17:29 +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
824db25a74
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/core/class/commonobject.class.php
2011-11-08 00:17:20 +01:00
Laurent Destailleur
3d0c324f5f
Fix: Message for stock movement was wrong or missing
2011-11-08 00:03:19 +01:00
Regis Houssin
dea5ec5e26
Fix: reorder problem with external module
2011-11-07 22:32:22 +08:00
Laurent Destailleur
fd9e0d8643
Qual: Removed code that must be stored into external modules
2011-11-05 12:34:54 +01:00
Juanjo Menent
5c9ba8a548
[task 189] Move Error* key from other.lang into errors.lang files
2011-10-29 23:52:05 +02:00
Regis Houssin
3338649316
[task #217 ] Move core files in core directory
2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f
[task #216 ] Move lib in core directory
2011-10-24 12:59:44 +02:00
Regis Houssin
63d60a33fc
[task #216 ] Move lib in core directory
2011-10-24 11:25:54 +02:00
Regis Houssin
c65238b773
[task #216 ] Move lib in core directory
2011-10-24 10:45:06 +02:00
Regis Houssin
87bbcaf9f6
Fix: remove obsolete code
...
use objectlinked for retrieve origin and origin_id of an object
2011-10-21 11:03:19 +02:00
Laurent Destailleur
0bc80e9bec
Qual: Doxygen
...
Qual: Uniformize some code
2011-10-14 18:51:20 +02:00
Regis Houssin
24c9a7d26d
Fix: reorder line after update line with fk_parent_line
2011-10-06 00:11:53 +08:00
Laurent Destailleur
be6286c4b8
Qual: More POO.
...
Qual: Doxygen
2011-09-20 17:19:46 +00:00
Regis Houssin
551e1f81bf
Fix: Space after closing parenthesis of function call prohibited
2011-09-20 13:32:16 +00:00
Regis Houssin
b6a2f13673
Fix: avoid jenkins warning
...
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2
Fix: replace sizeof() by count()
2011-09-17 19:49:50 +00:00
Laurent Destailleur
411b3415eb
Doxygen
2011-09-12 17:08:02 +00:00
Laurent Destailleur
cf917a70f1
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Laurent Destailleur
197257de90
Comment
2011-09-11 10:34:08 +00:00
Laurent Destailleur
6bd634b164
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Laurent Destailleur
b9129b1a60
Comment
2011-09-11 10:34:08 +00:00
Laurent Destailleur
a50db95e7e
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Laurent Destailleur
84075f6fab
Comment
2011-09-11 10:34:08 +00:00
Laurent Destailleur
b75d19c264
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Laurent Destailleur
fc7700501f
Comment
2011-09-11 10:34:08 +00:00
Laurent Destailleur
209a134c48
Fix: pgsql compatibility
2011-09-10 23:53:22 +00:00
Laurent Destailleur
b92f7268ec
Fix: When creating invoice from other object, discount are created
...
automatically
2011-09-10 17:52:21 +00:00
Laurent Destailleur
a41c9c9f1e
Fix: pgsql compatibility
2011-09-10 23:53:22 +00:00
Laurent Destailleur
4dbbef67d2
Fix: When creating invoice from other object, discount are created
...
automatically
2011-09-10 17:52:21 +00:00
Laurent Destailleur
2587ee5c38
Fix: pgsql compatibility
2011-09-10 23:53:22 +00:00
Laurent Destailleur
65c2d93a29
Fix: When creating invoice from other object, discount are created
...
automatically
2011-09-10 17:52:21 +00:00
Laurent Destailleur
8426d806f0
Fix: pgsql compatibility
2011-09-10 23:53:22 +00:00
Laurent Destailleur
605355c89c
Fix: When creating invoice from other object, discount are created
...
automatically
2011-09-10 17:52:21 +00:00
Laurent Destailleur
fede124eb3
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
926c687380
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
33a63566dd
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
696acf5e77
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
b224784675
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
38896c07a3
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
1e62cc0bce
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
7345c3eb42
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
f999df54a5
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
320fb3288b
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
549b7a655b
Qual: Uniformize code
...
Doxygen
2011-09-08 20:02:57 +00:00
Laurent Destailleur
abddab8eb5
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
ebbac8f1d1
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
87373052ed
Fix: Removed regex error
2011-09-08 19:40:49 +00:00
Laurent Destailleur
45467f0654
Fix: Removed regex error
2011-09-08 19:39:40 +00:00
Laurent Destailleur
9bdb1057e1
Fix: W3C
2011-08-31 15:30:56 +00:00
Laurent Destailleur
2bb5e4ba69
Fix: W3C
2011-08-31 15:12:09 +00:00
Laurent Destailleur
1aaf65c257
PDF works with us letter format
2011-08-31 14:42:47 +00:00
Regis Houssin
03711cf6f2
Fix: remove obsolete tags
2011-08-27 19:15:14 +00:00
Regis Houssin
2ecc03104c
Fix: remove obsolete tags (in progress)
2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd
Fix: remove obsolete tags (in progress)
2011-08-27 14:24:16 +00:00
Laurent Destailleur
cfe34139cf
Qual: Clean and uniformize code.
...
Remove properties, that are not related to business, from parent business class commonobject.
2011-08-22 22:04:21 +00:00
Laurent Destailleur
e9b113ade8
Qual: Mutualize some code
...
Fix: Missing begin
Fix: Removed functions returning database cursor
2011-08-14 03:13:50 +00:00
Laurent Destailleur
3f2e6bbf82
Qual: Removed dead code
2011-08-14 02:11:15 +00:00
Laurent Destailleur
9eea2e86af
doxygen
2011-08-14 00:00:06 +00:00
Regis Houssin
932b8f90e1
Fix: works on repair broken features
2011-08-12 05:41:01 +00:00
Regis Houssin
00aaaac8aa
Fix: works on repair broken features
2011-08-11 15:14:50 +00:00
Laurent Destailleur
dcd3ab435d
Qual: Removed no more used external libraries (fpdi_protection)
...
Qual: Centralize include of external libray fpdi
Qual: Now use fpdi with no changes
2011-08-11 12:13:59 +00:00
Laurent Destailleur
1f37f2bbbd
Removed deprecated files FPDF.
2011-08-10 23:20:55 +00:00
Laurent Destailleur
acea604e54
Change signature of all call executHooks.
...
Now they accept all the following signature:
executeHooks('method',$parameters,$object,$action)
2011-08-10 22:47:33 +00:00
Regis Houssin
66d5d6905f
Fix: works on repair broken features
2011-08-10 19:55:21 +00:00
Laurent Destailleur
f4606c2253
Fix: Avoid errors into rpm packages
2011-08-03 00:45:22 +00:00
Laurent Destailleur
e2c007305c
Fix: Avoid errors into rpm packages
2011-07-31 22:21:57 +00:00
Laurent Destailleur
cc840ad66e
Fix: Avoid errors into rpm packages
2011-07-31 21:24:20 +00:00
Regis Houssin
d82e40b010
Fix: object is a parameter
2011-07-14 05:21:52 +00:00
Laurent Destailleur
2e8ce5e513
Fix: No check box if no PDF
2011-07-13 14:41:02 +00:00
Laurent Destailleur
e2b18d565a
Fix: Bad order on documents pages
2011-07-06 20:56:48 +00:00
Regis Houssin
129c3dd101
Fix: uniformize code
...
Fix: add confirm delete file
New: add upload and delete file triggers
2011-07-05 16:10:56 +00:00
Regis Houssin
54effb5b27
Fix: add more triggers
2011-07-04 10:35:48 +00:00
Laurent Destailleur
df8da8678b
Fix: pgql compatibility
2011-07-04 10:30:00 +00:00
Regis Houssin
f344dbdefe
Fix: Name of hook must also be unique for each tab
2011-06-30 13:27:20 +00:00
Regis Houssin
f7883c6cb6
Fix: include trigger
2011-06-20 06:59:04 +00:00
Regis Houssin
4d27ac55da
Fix: bad field name
2011-06-15 15:22:48 +00:00
Laurent Destailleur
a6b82d843b
New: Creation of contacts from third party page go back to third party.
2011-06-13 15:14:11 +00:00
Laurent Destailleur
3b5bfd5ae0
New: Statistics support filtering on user.
2011-06-13 14:17:44 +00:00
Laurent Destailleur
f46492befe
New: Statistics support filtering on user.
2011-06-13 13:42:51 +00:00
Laurent Destailleur
2ffb4f2d02
Qual: Uniformize user interface
2011-06-13 13:07:10 +00:00
Laurent Destailleur
e1094fc293
Qual: Debug and clean notification module
2011-06-12 18:05:30 +00:00
Laurent Destailleur
993428e093
Work on workflow module.
2011-06-06 19:15:44 +00:00
Regis Houssin
8e25cb1ae5
Fix: possibility to have more hooks in the same page
...
New: add left search block hook and extra left block hook
2011-05-31 14:04:45 +00:00
Laurent Destailleur
86d83f9896
Enhance specimen
2011-05-30 18:48:19 +00:00
Regis Houssin
8d8fd9ba91
Works on paypal module
...
Fix: add multi status
2011-05-25 12:33:59 +00:00
Regis Houssin
e77298321a
Works on paypal module
...
Fix: replace ref_ext by ref_int
2011-05-24 09:50:51 +00:00
Laurent Destailleur
edd91b7d26
Qual: Clean stock increase/decrease code
2011-05-23 23:46:39 +00:00
Regis Houssin
4ed929d218
Works on paypal module
...
Fix: db begin problem
Fix: ref_ext record problem
2011-05-22 19:42:55 +00:00
Regis Houssin
6d56cc196b
Works on paypal module
...
Fix: better error management
2011-05-22 18:12:42 +00:00
Laurent Destailleur
106a956889
Fix: Some fix in preview feature.
2011-05-21 14:24:09 +00:00
Laurent Destailleur
5440ad97c6
New: Add default label into stock movement label
2011-05-18 17:18:42 +00:00
Laurent Destailleur
781e806c19
Doxygen
2011-05-16 14:01:39 +00:00
Regis Houssin
f63850c5e9
Fix: remove watermark after validation
2011-05-11 15:01:09 +00:00
Laurent Destailleur
1817a045ac
Doc
2011-05-09 22:28:55 +00:00
Regis Houssin
67fe35e67b
Fix: mutualize code, more simple
2011-05-06 18:27:18 +00:00
Regis Houssin
827eed5d39
Fix: delete deprecated code
...
Fix: change select_contact for view exclude contcat in grey mode
2011-04-26 13:49:41 +00:00
cdelambert
7919c35891
Fix Bug bug #33100
2011-04-16 12:10:57 +00:00
Regis Houssin
f4bd45c087
Fix: possibility to skip update total of special lines with no qty and unit price
2011-04-14 13:52:48 +00:00
Regis Houssin
7b73576731
Fix: possibility to skip update total of special lines with no qty and unit price
2011-04-13 15:39:03 +00:00
Regis Houssin
1c89213caf
Fix: reorder the lines correctly
2011-04-11 09:00:13 +00:00
Regis Houssin
d567827f3e
Fix: problem for view normal product/service
2011-04-11 07:56:58 +00:00
Regis Houssin
fba4111f44
Fix: do not update price with special product 9
2011-04-10 18:44:58 +00:00
Regis Houssin
a3eebde120
Fix: problem with clone and hooks
2011-04-10 15:32:34 +00:00
Regis Houssin
ee5c282ccd
Fix: problem with $line->update_total if no $total_localtax
2011-04-10 10:37:05 +00:00
Regis Houssin
a2902877ce
Fix: uniformize code
2011-04-10 09:57:54 +00:00
Regis Houssin
75bf04ec71
Fix: use FactureLigne class for delete line
2011-04-10 09:47:12 +00:00
Regis Houssin
da05338224
Fix: reorder correctly if fk_parent_line
...
Fix: uniformize code
2011-04-10 09:22:47 +00:00
Regis Houssin
78a0078906
Fix: not update total with special line (for the moment)
2011-04-10 09:09:14 +00:00
Regis Houssin
b163b0c73c
Fix: hook is already instantiate
...
Fix: add fk_parent_line in customer bill
2011-04-10 07:52:30 +00:00
Laurent Destailleur
eac83150bc
Add option FACTURE_CAN_BE_REMOVED
2011-04-08 08:15:33 +00:00
Laurent Destailleur
1a3c45faea
New: task #10969 : Add checkbox to close automatically invoice to "payed"
2011-03-19 13:59:04 +00:00
Laurent Destailleur
bdf3b91075
Fix: clean parameter
2011-03-16 11:38:54 +00:00
Laurent Destailleur
0aab6b15ae
Doxygen
2011-03-13 18:31:16 +00:00
Laurent Destailleur
e9f4879245
Qual: Prepare move of function dol_delete_file into file.lib.php
2011-03-09 15:34:57 +00:00
Laurent Destailleur
6fa657a904
Fix: pgsql compatibility
2011-03-09 10:47:28 +00:00
Laurent Destailleur
8d3b0d4470
Doxygen
2011-03-08 11:21:39 +00:00
Laurent Destailleur
5f27c01f8b
Qual: Uniformize code
2011-03-08 11:13:14 +00:00
Laurent Destailleur
b2532440fb
Doxygen
2011-03-08 11:12:57 +00:00
Laurent Destailleur
c7e8e6958b
Fix: Error when cloning invoice with discount
2011-03-07 02:06:43 +00:00
Laurent Destailleur
31c4cc0ecf
Fix: Error when cloning invoice with discount
2011-03-07 02:04:44 +00:00
Regis Houssin
da785fad43
Fix: view multi page
2011-03-04 19:57:08 +00:00
Regis Houssin
0bbde401ef
Fix: view multi page
2011-03-04 18:50:54 +00:00
Regis Houssin
11a3b7f6eb
Fix: reencoding preview tabs, Imagick is a class today
...
Fix: uniformize code
2011-03-04 16:52:29 +00:00
Regis Houssin
20ea744d8a
Fix: reencoding preview tabs, Imagick is a class today
2011-03-04 12:27:40 +00:00
Laurent Destailleur
768914fd18
Fix: Use defined variable
2011-03-02 09:58:10 +00:00
Laurent Destailleur
ef6a3c07b4
Fix: Error management
2011-03-01 10:26:41 +00:00
Regis Houssin
3b4ea76538
Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class
2011-02-24 18:11:12 +00:00
Laurent Destailleur
371c4a6090
Qual: Remove usage of deprecated properties
2011-02-20 12:06:11 +00:00
Laurent Destailleur
87f2b821de
New: Can add a discount directly when building invoice
2011-02-19 12:15:17 +00:00
Laurent Destailleur
638cb105df
Fix: HTML tags must be escaped
2011-02-18 10:45:38 +00:00
Laurent Destailleur
e54dd25c04
Uniformize code
2011-02-11 19:48:12 +00:00
Laurent Destailleur
d07aeb87c0
Fix: sql syntax error
2011-02-11 19:47:15 +00:00
Laurent Destailleur
3c40b0fd4d
Fix: sql syntax error
2011-02-11 19:32:46 +00:00
Laurent Destailleur
7e1e28f0d8
Fix: Wrong order of name/firstname
2011-02-09 18:27:56 +00:00
Laurent Destailleur
70ec9f70b7
Comment
2011-02-06 00:20:15 +00:00
Philippe Grand
6d26a530d5
change comment
2011-01-17 09:37:01 +00:00
Philippe Grand
de910df144
issue to wrong link
2011-01-06 12:46:25 +00:00
Laurent Destailleur
4e8b22d23e
Fix: Filter on late unpaid was wrong
2010-12-31 10:59:50 +00:00
Laurent Destailleur
2535926cb9
Fix: Some fix in PDF position
2010-12-31 00:15:13 +00:00
Regis Houssin
6dc53a91c6
Fix: try to use $GLOBALS in template to correct dol_include_once problem
2010-12-24 11:28:46 +00:00
Regis Houssin
a97173b662
Use another method for external module
2010-12-16 18:40:02 +00:00
Regis Houssin
502bb75d2c
Fix: uniformize code
2010-12-15 07:12:28 +00:00
Laurent Destailleur
f94248eae1
Fix: Some fix into line edit
2010-12-15 00:54:28 +00:00
Laurent Destailleur
2498426867
Fix: Restore stable version for 3.0
2010-12-14 23:27:17 +00:00
Regis Houssin
9d46536909
Fix: uniformize code
2010-12-14 15:04:56 +00:00
Regis Houssin
409758c1ec
Works on hooks module
2010-12-14 11:46:49 +00:00
Laurent Destailleur
09fc3ba4c5
Fix: Function to find last invoice must look only into number
2010-12-13 23:38:47 +00:00
Laurent Destailleur
86ffc32195
Qual: Uniformize a lot of code (supplier_invoice => invoice_supplier, same for order)
...
New: Add link between supplier invoices and supplier orders.
2010-12-13 13:16:02 +00:00
Laurent Destailleur
f50738c69d
Work on web services
2010-12-07 08:36:50 +00:00
Laurent Destailleur
ad19fc1ca9
New: Work on web services
2010-12-05 20:33:24 +00:00
Laurent Destailleur
cc93d642e0
Fix: Date was not always visible
2010-12-01 23:42:39 +00:00
Laurent Destailleur
6e75a3d203
Restore work lost by savannah backup
2010-12-01 21:16:28 +00:00
Laurent Destailleur
adfb9ea341
Sec: Removed security holes
2010-11-20 13:08:44 +00:00
Laurent Destailleur
86d7214a43
Fix: Merge of PDF works with TCPDF.
2010-11-16 11:59:12 +00:00
Laurent Destailleur
8bc3bae49e
New: Add suppliers orders to process in dashboard
2010-11-13 17:37:22 +00:00
Laurent Destailleur
c7c4a83f58
Work on compatibility between FPDF and TCPDF. Now language file main.lang can be used to defined which font to use with TCPDF (Always Helvetica with FPDF).
2010-11-13 02:58:29 +00:00
Juanjo Menent
6acf25958e
Fix: empty local tax
2010-11-06 17:52:07 +00:00
Laurent Destailleur
49bd52c4ab
Fix: Bad link
2010-11-04 19:05:05 +00:00
Laurent Destailleur
a718947b3d
Fix: Detailed informations of email actions was lost
2010-10-27 16:49:26 +00:00
Laurent Destailleur
5b96527805
Qual: Uniformize code (ligne -> line)
2010-10-27 14:15:30 +00:00
Regis Houssin
f63d43d044
Fix: bad increment
2010-10-21 09:41:16 +00:00
Laurent Destailleur
c9ab28cc58
Add comment
2010-10-18 01:58:53 +00:00
Laurent Destailleur
f30061ca0c
Fix: Can not edit line for free product lines. Also type was lost.
2010-10-16 13:10:24 +00:00
Laurent Destailleur
46ad8917ad
Perf: A little speed enhancement on document tabs.
2010-10-03 15:50:34 +00:00
Laurent Destailleur
0e663354f0
Fix: Preview was broken after renaming lignes into lines
2010-10-02 11:47:15 +00:00
Laurent Destailleur
eee4350867
Restore some broken features
2010-09-15 15:07:14 +00:00
Laurent Destailleur
eacc9361ea
Fix: Detection of country of bank account failed
...
New: Can change order of fields in bank info
2010-09-15 10:30:57 +00:00
Regis Houssin
4accdad6a3
Works on module hook integration
2010-09-12 15:04:13 +00:00
Regis Houssin
3063abfdfe
Fix: use addline function
2010-09-11 17:27:28 +00:00
Regis Houssin
9edb72f2f5
Fix: use addline function
2010-09-11 14:02:15 +00:00
Regis Houssin
dfd509e787
Works on module hook integration
2010-09-11 12:21:36 +00:00
Regis Houssin
da5f21a732
Works on module hook integration
2010-09-11 11:54:59 +00:00
Regis Houssin
156a1e6b29
Qual: uniformize code
2010-09-10 14:35:07 +00:00
Regis Houssin
dd8b92e5f0
Works on module hook integration
2010-09-10 11:08:25 +00:00
Regis Houssin
86d0e9c465
Works on module hook integration
2010-09-10 10:42:24 +00:00
Regis Houssin
dcfcb1bc53
Works on module hook integration
2010-09-09 17:40:25 +00:00
Regis Houssin
97f4b62c80
Works on hook integration in pdf
2010-09-09 16:57:53 +00:00
Regis Houssin
9664f0af5f
Qual: big uniformize code
2010-09-09 14:06:15 +00:00
Laurent Destailleur
bbb1db7a51
Work on invoice creation when creating subscription
2010-09-07 01:32:20 +00:00
Laurent Destailleur
3b5d63440a
Doxygen
2010-09-06 23:57:44 +00:00
Regis Houssin
f4e656eee1
Fix: regression
2010-09-06 22:31:36 +00:00
Laurent Destailleur
46546a78ab
Fix: Restore all behaviour of order management of line. The new one is too complex and could not work as it is done.
2010-09-06 21:10:45 +00:00
Regis Houssin
63908863cc
Works on migration management positioning lines
...
Phase 4 : llx_expeditiondet et llx_livraisondet
2010-09-06 16:39:38 +00:00
Regis Houssin
75422f6e6f
Works on migration management positioning lines
...
Phase 4 : llx_expeditiondet et llx_livraisondet
2010-09-06 16:37:19 +00:00
Regis Houssin
b9ba88a5d2
Works on migration management positioning lines
...
Phase 4 : llx_expeditiondet et llx_livraisondet
2010-09-06 16:31:28 +00:00
Regis Houssin
cf4aa19d0c
Works on migration management positioning lines
...
Phase 3 : llx_facturedet
2010-09-06 14:37:29 +00:00
Laurent Destailleur
75395dd4c1
Qual: Code is now simpler using jQuery. Removed rubbish javascript.
2010-09-06 10:35:07 +00:00
Laurent Destailleur
dfeab93723
Qual: Uniformize dictionnary table names.
2010-09-06 01:04:07 +00:00
Laurent Destailleur
488105a6d5
New: Add class to manage payment terms
2010-09-06 00:43:45 +00:00
Laurent Destailleur
cb73e03168
Qual: Uniformize dictionnary table names.
2010-09-05 23:39:37 +00:00
Laurent Destailleur
2921fc4f44
New: Maxi debug of withdraw module.
...
Move module to stable to hope having more user testing/using it.
2010-09-05 13:24:59 +00:00
Laurent Destailleur
a7f6fdecca
Work on replacement of FPDF with TCPDF
2010-09-01 14:32:13 +00:00
Laurent Destailleur
660ffdfea5
Fix: type was not loaded
2010-09-01 12:20:34 +00:00
Laurent Destailleur
a2cca4c215
Work on FPDF replacement by TCPDF
2010-09-01 11:44:27 +00:00
Laurent Destailleur
f5a945cf74
Work on FPDF replacement by TCPDF
2010-09-01 10:22:11 +00:00
Laurent Destailleur
00803e8ae8
Fix: Postgresql compatibility
2010-08-29 20:34:20 +00:00
Philippe Grand
fb06c15330
task #6689 , strlen problem
...
replace strlen with dol_strlen
2010-08-24 14:42:18 +00:00
Laurent Destailleur
fdc13a2480
Qual: Uniformize code
...
Doc: Doxygen
2010-08-18 07:28:12 +00:00
Regis Houssin
a77c2ae364
Fix: possibility to defined rang with an external module
2010-08-17 15:07:22 +00:00
Laurent Destailleur
8dabc0d659
Fix: Error in creating line
2010-08-12 22:42:56 +00:00
Laurent Destailleur
5affcd3b3f
Qual: Renamed french field "envente" into "tosell".
2010-08-11 18:35:31 +00:00
Laurent Destailleur
411419c3bf
Restore broken feature
2010-08-09 16:57:24 +00:00
Laurent Destailleur
d3536e3d42
Fix: Database compatibility
2010-08-09 16:07:23 +00:00
Regis Houssin
aa62559812
Fix: fetch_client is deprecated
2010-08-06 13:56:25 +00:00
Laurent Destailleur
39e4c69fc6
Fix: W3C in templates
2010-07-29 15:30:18 +00:00
Laurent Destailleur
7b59a66d11
Fix: Insert error
2010-07-23 21:57:07 +00:00
Laurent Destailleur
2db5b658f1
Fix: Some errors in vat management with multiprice
2010-07-22 21:16:29 +00:00
Laurent Destailleur
2183739757
Fix: W3C errors
2010-07-21 18:24:26 +00:00
Laurent Destailleur
fc2213a8f1
Doxygen
2010-07-21 12:35:56 +00:00
Laurent Destailleur
29536ecbd8
Fix: Use correct order of firstname and lastname.
2010-07-18 10:39:07 +00:00
Laurent Destailleur
4e45d70c25
Fix: include missing or with wrong path
2010-07-17 20:25:56 +00:00
Laurent Destailleur
70b9d38b70
Fix: include missing or with wrong path
2010-07-17 20:25:56 +00:00
Laurent Destailleur
fb4173673a
Fix: Fix on PHPUnit tests
2010-07-14 23:10:56 +00:00
Regis Houssin
3e20c737d1
Fix: label of product is lost
...
Fix: translation
2010-07-05 11:20:14 +00:00
Juanjo Menent
984ff2ddcf
Local Taxes: Comments on function parameters
2010-06-22 08:07:23 +00:00
Juanjo Menent
ca124a1476
Local Taxes: Works in Invoices.
...
Contracts: Patch to invoicing with the new invoices changes.
Trad: Orders: Tab Compta.
2010-06-21 16:49:41 +00:00
Laurent Destailleur
4c13b6fd77
New: Debug widthrawal module
2010-06-14 21:48:04 +00:00
Laurent Destailleur
f1b30d3caa
New: Widthrawal module is no more experimental
2010-06-14 21:16:52 +00:00
Juanjo Menent
b7d35c7802
Trad: Standing orders
...
Fix: Withdrawals. Creation buttons position more in line with header information
2010-06-10 15:15:14 +00:00
Laurent Destailleur
cd740acef6
Fix: Missing translation loading
2010-05-25 22:22:24 +00:00
Laurent Destailleur
1a90eefb86
Fix: Head array hidden if nothing
2010-05-20 22:23:58 +00:00
Regis Houssin
dc77231df7
Fix: change proformat to proforma
2010-05-17 15:41:17 +00:00
Laurent Destailleur
426317a355
Qual: Removed deprecated method
2010-05-09 15:15:10 +00:00
Laurent Destailleur
8374bf42bb
Rename static object
2010-05-09 14:55:49 +00:00
Laurent Destailleur
f6416534f2
Qual: Removed pdate
2010-05-08 20:47:12 +00:00
Laurent Destailleur
99382521b3
Qual: Removed pdate
2010-05-08 19:49:29 +00:00
Laurent Destailleur
bfdd9087ba
Qual: Removed pdate
2010-05-08 19:31:43 +00:00
Laurent Destailleur
22b61585ca
Doc
2010-05-08 18:39:41 +00:00
Laurent Destailleur
6e06c82bb4
Fix: Can create a deposit invoice from a predefined invoice
2010-05-07 18:36:54 +00:00
Laurent Destailleur
61811dc5be
Fix: Postgresql compatibility
2010-05-07 18:30:31 +00:00
Laurent Destailleur
887863a59c
Move numbering invoices files
2010-05-05 22:24:18 +00:00
Laurent Destailleur
4689582826
Move numbering invoices files
2010-05-05 22:21:25 +00:00
Laurent Destailleur
e4bba520f7
Now fetch for User class use id like other classes.
2010-05-05 17:36:20 +00:00
Philippe Grand
a981577553
according to new tree directory
2010-05-03 08:43:32 +00:00
Philippe Grand
7f13eb0d4e
according to new tree directory
2010-05-03 08:22:35 +00:00
Laurent Destailleur
968addfad3
Fix: Better error management in upload files
2010-05-01 14:28:48 +00:00
Laurent Destailleur
004a4cbb40
Fix: Look
2010-04-29 20:51:58 +00:00
Regis Houssin
54f424eedf
Add a common function to delete the linked contact
2010-04-29 15:35:52 +00:00
Philippe Grand
16a8ab7d59
according to new tree directory
2010-04-29 14:54:12 +00:00
Philippe Grand
b749e6bdcf
according to new tree directory
2010-04-29 14:34:21 +00:00
Philippe Grand
391c595dda
according to new tree directory
2010-04-29 08:50:46 +00:00
Philippe Grand
b65ddfabe8
according to new tree directory
2010-04-28 21:29:12 +00:00
Regis Houssin
ebdbeec4a9
Fix: mutualize code
2010-04-28 19:23:36 +00:00
Laurent Destailleur
798ac42880
Fix: When all boxes are moved on a side, we can still move on the other side
2010-04-28 15:31:49 +00:00
Laurent Destailleur
4c73cb64c8
Move/Rename numbering module files for invoices to normalize code.
2010-04-28 13:49:13 +00:00
Philippe Grand
3f4bee1f18
according to new tree directory
2010-04-28 12:53:28 +00:00
Regis Houssin
32374f6242
Fix: move class to class directory
2010-04-28 12:39:09 +00:00
Laurent Destailleur
fe411c357c
Trad
2010-04-28 11:23:17 +00:00
Philippe Grand
b6bc9223df
according to new tree directory
2010-04-28 10:33:16 +00:00
Philippe Grand
24725ce2a6
according to new tree directory
2010-04-28 10:11:41 +00:00
Philippe Grand
b68a359265
according to new tree directory
2010-04-28 10:02:54 +00:00
Philippe Grand
388470d146
according to new tree directory
2010-04-28 07:55:43 +00:00
Laurent Destailleur
a4f144f24d
Qual: Uniformise code. user class use id in first param of fetch
2010-04-28 07:31:34 +00:00
Laurent Destailleur
128dc50c75
Uniformize code
2010-04-27 11:08:07 +00:00
Laurent Destailleur
e731e7414e
Fix: Missing triggers for suppliers invoices
2010-04-25 21:22:06 +00:00
Laurent Destailleur
9626a1bc4f
Fix: Missing triggers for suppliers invoices
2010-04-25 21:22:06 +00:00
Philippe Grand
c418128a07
according to new tree directory
2010-04-25 14:17:39 +00:00
Philippe Grand
4cdf6d0bae
according to new tree directory
2010-04-25 14:17:39 +00:00
Laurent Destailleur
b7247f3396
Complete initAsSpecimen
2010-04-25 11:37:22 +00:00
Philippe Grand
b5e43aa11c
move paiement.class.php file to compta/paiement/class/ directory
2010-04-25 08:47:08 +00:00
Laurent Destailleur
6848d72010
Fix: Use propal date for propal numbering.
2010-04-24 11:02:38 +00:00
Regis Houssin
335c038dd8
Fix: regression
2010-04-21 22:14:11 +00:00
Regis Houssin
621bd68e3b
Fix: workflow module is enabled by default
...
Fix: integration of triggers in the workflow module
!!! we now call "call_workflow" instead of "run_triggers" !!!
2010-04-21 16:29:37 +00:00
Philippe Grand
84f8a18a72
move discount.class.php to core directory
2010-04-13 14:30:11 +00:00
Philippe Grand
684e6bc63c
move notify.class.php to core directory
2010-04-13 14:17:01 +00:00
Juanjo Menent
30dcda109e
Works on enhancement of local taxes. Changes in calcul_price_total
2010-04-12 09:53:49 +00:00
Laurent Destailleur
0fe708a5f6
Fix: Error when using iphone
...
Fix: Error in not found class
2010-04-12 00:30:52 +00:00
Regis Houssin
45967843cb
Fix: trad
2010-04-09 08:04:18 +00:00
Regis Houssin
73f216fd89
Fix: rename $class to $classname to prevents problems
...
http://www.manuelphp.com/php/reserved.keywords.php
2010-04-09 07:55:37 +00:00
Regis Houssin
7b1c726424
Add possibility to add linked object block in object card for external module
...
Fix: templates integration
2010-04-09 07:23:32 +00:00
Regis Houssin
d8982e5d8c
Add possibility to add linked object block in object card for external module
...
Fix: templates integration
2010-04-09 06:47:13 +00:00
Regis Houssin
8774e69ea9
Add possibility to add linked object block in object card for external module
...
Fix: templates integration
2010-04-09 06:20:10 +00:00
Philippe Grand
01991cec89
move stats class to core directory
2010-04-08 13:19:42 +00:00
Philippe Grand
011ea91f81
move interfaces class to core directory
2010-04-08 13:09:00 +00:00
Philippe Grand
397c5487d0
Move file client.class.php to societe directory
2010-04-01 08:12:45 +00:00
Philippe Grand
78b9faca85
move class file commonobject to core directory
2010-03-29 16:40:57 +00:00
Laurent Destailleur
b6d8b648d9
Qual: Remove deprecated files
2010-03-27 15:32:56 +00:00
Laurent Destailleur
f8329da895
Remove pre.inc.php
2010-03-27 02:35:08 +00:00
Laurent Destailleur
bdf4bbaa1f
Works on ODT import
2010-03-27 00:33:28 +00:00
Philippe Grand
3ce3c74ba7
Move facture class file to compta/facture directory
2010-03-26 15:45:01 +00:00
Philippe Grand
a56832d521
move contact class file to contact directory
2010-03-25 13:51:24 +00:00
Regis Houssin
c7df8f8807
Fix: move module class to your own directory
2010-03-22 15:31:13 +00:00
Regis Houssin
6822a1b18b
Fix: uniformise and clean code
2010-03-11 14:31:16 +00:00
Regis Houssin
2dc31fa613
Fix: uniformise and clean code
2010-03-11 10:40:58 +00:00
Regis Houssin
5c0d4b896b
Fix: uniformize code
2010-01-28 13:27:34 +00:00
Regis Houssin
3c74bd21ca
Works on enhancement of project tasks
...
Fix: move class in directory of module
2010-01-22 20:20:41 +00:00
Laurent Destailleur
45067e7d4d
Fix: We must use the long label for payment condition on PDF documents
2010-01-20 19:38:41 +00:00
Laurent Destailleur
935431eba3
New: Support note on trips module
2010-01-14 23:21:22 +00:00
Regis Houssin
3388e4ad37
Fix: add virus alert
2010-01-08 10:02:53 +00:00
Regis Houssin
432dc7a009
Works on migration of relationship tables
2009-12-12 20:41:27 +00:00
Laurent Destailleur
957318f9d2
Exclude only replaced (duplicated) invoices.
2009-11-29 13:13:02 +00:00
Regis Houssin
5ea37d7835
Fix: limit prefix_com field
...
Fix: use invoice field entity in stat
Fix: replaced invoice is already with statut 3
2009-11-28 07:14:25 +00:00
Regis Houssin
d6e0912f6c
Fix: bad security access
...
Fix: add entity in facture_rec and constraint with fk_soc
Fix: uniformize code
2009-11-19 11:25:08 +00:00
Regis Houssin
100607da1a
Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0
2009-10-21 09:51:52 +00:00
Regis Houssin
01291c4a7c
Fix: function "split" is deprecated since php 5.3.0
2009-10-20 13:14:44 +00:00
Laurent Destailleur
eb4d353f11
Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them.
2009-10-04 18:01:30 +00:00
Laurent Destailleur
e192abc755
Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them.
2009-10-04 15:52:16 +00:00
Laurent Destailleur
bbcefa8864
Qual: Uniformize code (navigation on objects)
...
Qual: Code to support filter on entity on objects navigation is simpler.
2009-10-04 12:16:45 +00:00
Laurent Destailleur
c296965865
Fix: Some ajax features was broken
2009-08-27 22:20:01 +00:00
Laurent Destailleur
9c53f0ed8e
Fix: Fix global typo error
2009-08-19 17:16:47 +00:00
Laurent Destailleur
f25e136db8
Fix: Fix global typo error
2009-08-19 17:07:48 +00:00
Laurent Destailleur
06b9e9cd24
New: Add picto on tab titles
2009-08-05 18:22:40 +00:00
Laurent Destailleur
7b6e23b646
Fix: W3C
2009-07-29 22:34:58 +00:00
Laurent Destailleur
0cc71ca978
Fix: bug #26929 : les fichiers contenant le signe + dans le nom ne peuvent être téléchargés
...
Ne:w Use new confirm popup to delete file confirmation
2009-07-16 00:43:59 +00:00
Regis Houssin
f96ea81ac5
Fix: replace with simple directory
2009-07-05 08:31:08 +00:00
Laurent Destailleur
53f5a6e186
Use ref date
2009-06-05 11:59:07 +00:00
Laurent Destailleur
b71190f5ee
Fix: Bad alignement of columns
2009-05-28 02:27:54 +00:00
Laurent Destailleur
892a8c1ce4
Fix: make fix on predefined invoice feature.
2009-05-27 01:48:31 +00:00
Laurent Destailleur
930b400458
Uniformize code and make fix on predefined invoice feature.
2009-05-27 01:15:44 +00:00
Regis Houssin
06d2d2fc2f
Fix: nous ne sommes jamais trop prudent !
2009-05-18 13:10:40 +00:00
Regis Houssin
e5d222b6cc
Fix: régression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car
...
comportement aléatoire avec certaines fonctions
2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2
Fix: ajout d'un niveau supplémentaire du cache du jeton
2009-05-16 15:45:26 +00:00
Regis Houssin
b1e630a3fa
Fix: ajout d'un jeton aléatoire dans les requetes POST
2009-05-15 14:41:19 +00:00
Laurent Destailleur
6335fe2b55
Qual: Use a so much simpler way to have ajax confirmation boxes
2009-05-06 15:45:50 +00:00
Regis Houssin
c71c2f39fb
Add: can defined submodule name (ex: $conf->module->submodule->dir_output)
...
Add: can change the module name if different (ex: $conf->newmodulename->dir_output)
2009-04-30 00:36:08 +00:00
Laurent Destailleur
7322cd136e
Fix: rename function sanitizeFileName into dol_sanitizeFileName to avoir conflict with fckeditor
2009-04-29 18:02:50 +00:00
Regis Houssin
3d149a33ca
New: parametre de config des repertoires dans les proprietes de la classe du module
...
avec un répertoire parent en fonction de l'entité
2009-04-28 18:14:50 +00:00
Regis Houssin
b86684805c
New: early development of multi-company module
2009-04-27 20:37:50 +00:00
Laurent Destailleur
55aa8bc4bc
Add a tool to merge all invoices in one PDF
2009-04-09 21:53:53 +00:00
Laurent Destailleur
6b155c359a
Trad: Text easier to understand
2009-04-09 20:22:51 +00:00
Laurent Destailleur
1f3f2b8c44
Log file for error messages use LOG_ERR level.
2009-03-12 22:49:05 +00:00
Laurent Destailleur
ba14103659
New: Upload of joined files need create/modify permissions to work
2009-03-03 00:12:56 +00:00
Laurent Destailleur
61e2282cb1
Qual: Removed deprecated code
2009-03-02 18:25:51 +00:00
Laurent Destailleur
0823322ba1
Qual: All call to dolibarr_ functions are made on dol_ functions.
2009-02-20 22:53:15 +00:00
Laurent Destailleur
a2b8b30a84
Reorganize code to reduce memory usage
2009-02-19 19:06:12 +00:00
Laurent Destailleur
c78bd22adc
Uniformize code for contacts linking
2009-02-18 12:26:55 +00:00
Laurent Destailleur
5fcd6b4af5
Contact page picto is more clear to distinguish internal from external users.
2009-02-16 22:37:30 +00:00
Laurent Destailleur
0d386d7e6c
Fix: A lot of debug in project module
2009-02-04 20:38:07 +00:00
Laurent Destailleur
21343804b8
Fix of build mass pdf files
2009-01-21 16:53:50 +00:00
Laurent Destailleur
8d19da30f4
Minor change
2009-01-09 22:52:45 +00:00
Laurent Destailleur
754e0111f3
Perf: Reduce nb of call to time function.
2009-01-07 15:21:16 +00:00
Laurent Destailleur
0bdd1efe2b
Qual: Renamed all function dolibarr_xxx to dol_xxx to use same prefix everywhere.
2009-01-07 10:57:36 +00:00
Laurent Destailleur
fe3e466503
Fix: Update private note was broken
2008-12-15 21:43:31 +00:00
Laurent Destailleur
dc46ba4000
Removed duplicate code.
...
Prepare dynamic disabling of modules
2008-11-27 23:02:49 +00:00
Laurent Destailleur
e6107ea32f
Support UTF8
2008-11-16 23:43:10 +00:00
Laurent Destailleur
c7569e6316
New: Added a link to vat payment on bank transaction view for vat payment.
2008-11-16 22:26:47 +00:00
Laurent Destailleur
b86223bc90
Maxi debug of withdraw module
2008-11-05 22:34:14 +00:00
Laurent Destailleur
70b0f0042e
Qual: Uniformize use of dolibarr_print_date
2008-10-26 15:55:50 +00:00
Laurent Destailleur
dbae510665
No special chars in filename
2008-10-25 21:18:53 +00:00
Laurent Destailleur
6a259176a4
Add option to set mask on new files
2008-10-21 21:27:20 +00:00
Laurent Destailleur
c2f3934f4e
Fix: Remove highlight field
2008-10-01 20:17:00 +00:00
Laurent Destailleur
1249eac510
Add supplier orders statistics report
2008-09-08 19:04:19 +00:00
Laurent Destailleur
e461753e43
Qual: Uniformize code.
2008-09-08 13:32:37 +00:00
Laurent Destailleur
74801a2914
Qual: Uniformize code.
2008-09-08 12:51:29 +00:00
Laurent Destailleur
ead04cbddc
New: Add statistics report for supplier invoices
2008-09-08 07:37:53 +00:00
Laurent Destailleur
e2ec5cb613
New: Add statistics report for supplier invoices
2008-09-08 07:32:03 +00:00
Laurent Destailleur
e434ffd4f6
Qual: Code cleaner for statistics
2008-09-07 21:36:42 +00:00
Laurent Destailleur
945b9649ef
Removed warning in eclipse
2008-09-05 22:39:33 +00:00
Laurent Destailleur
e3d0eeba8f
Code respect MVC
2008-09-05 22:37:21 +00:00
Laurent Destailleur
c9060f817d
Qual: Merge code between late unpayed invoices and unpayed invoices.
2008-09-04 19:47:46 +00:00
Laurent Destailleur
bd20a88be3
Fix: Removed bad W3C compliant HTML tags
2008-08-29 21:16:34 +00:00
Laurent Destailleur
9b89360f91
Add patch from patrick raguin to add the pdf unpayed concatenation feature.
2008-08-28 00:53:47 +00:00
Laurent Destailleur
1cf5e23bd0
Add patch from patrick raguin to add the pdf unpayed concatenation feature.
2008-08-28 00:53:05 +00:00
Laurent Destailleur
79eb1e85a8
Debug barcode module
2008-08-28 00:31:27 +00:00
Laurent Destailleur
4d0a68d48c
Removed all now() and sysdate() database sql inline function by a date defined by PHP ($db->idate(mktime())).
...
This is to be more portable, to solve problem when database server time differs from PHP server and to prepare for TZ support.
2008-08-27 18:53:27 +00:00
Laurent Destailleur
a6c6d19b3f
Fix: Pb with recurrent invoice
2008-07-26 14:48:22 +00:00
Laurent Destailleur
12279fddec
Fix: Documents links was bad if ref contains special chars
2008-07-10 17:11:04 +00:00
Laurent Destailleur
95299cccb9
Add protection on upload if file already exists
2008-05-04 15:19:03 +00:00
Laurent Destailleur
3ab531f65f
Add protection on upload if file already exists
2008-05-04 15:19:02 +00:00
Laurent Destailleur
17f06e3318
New: We can sort file list for all document pages like in ECM module
2008-05-04 14:24:29 +00:00
Laurent Destailleur
6167e0c181
Qual: Mutualize a lot of code
2008-05-04 13:33:49 +00:00
Laurent Destailleur
02464c4a2c
Qual: Reorganise files: Remove class from root directory.
2008-04-19 23:42:04 +00:00
Laurent Destailleur
d1edb63eec
Qual: code simplification
2008-04-17 11:30:04 +00:00
Laurent Destailleur
d5ccb222e8
Reorganize functions
2008-04-09 18:13:45 +00:00
Laurent Destailleur
c1edb57981
Qual: Remove duplicate code
2008-03-07 10:34:16 +00:00
Laurent Destailleur
6bd6e4a309
New: Add pages for agenda module
2008-03-01 01:26:41 +00:00
Laurent Destailleur
646a6307f0
New: Super clean of permissions checks
2008-02-25 20:03:21 +00:00
Laurent Destailleur
b12d53e13f
New: Super clean of permissions checks
2008-02-25 16:30:43 +00:00
Laurent Destailleur
6edf6c8100
Qual: Factorize duplicate code
2008-02-24 17:01:48 +00:00
Laurent Destailleur
99297fea62
Fix: Security check
2008-02-24 13:18:40 +00:00
Laurent Destailleur
520717cbbf
New: Support the Non Percu Recuperable vat in invoice form
2008-02-21 23:15:55 +00:00
Laurent Destailleur
fed065dd7f
Qual: Nettoyage de code redondant. L'appel a getright est inutile car deja dans le main.
2008-01-29 19:03:26 +00:00
Laurent Destailleur
eeb8bfafcb
Qual: Déplacement show_document dans html.formfile.class.php
2008-01-20 13:53:02 +00:00
Regis Houssin
c25c4dddf9
Remplacement du terme "éditer" par "modifier"
2008-01-10 23:59:58 +00:00
Laurent Destailleur
d7d4904cff
Qual: Réorganisation un peu plus logique de certaines fonctions. Réduction de la taille du fichier html.form.class.php qui est chargé a chaque fois et qui consomme a lui seul 1Mo
2008-01-10 17:12:07 +00:00
Laurent Destailleur
85ae98ad58
Fix: Mode connexion http incompatible avec autres
...
Fix: Graph stats sur facture et commande avec artichow
2008-01-02 13:08:27 +00:00
Laurent Destailleur
993799af8b
Fix: Pb avec graph bar artichow
2007-12-21 03:34:32 +00:00
Laurent Destailleur
bc6754033c
Fix: Quand on supprime reduc de type avoir, le statut de l'avoir redevient à non honoré (payé = 0 et statut = 1)
2007-12-02 17:59:06 +00:00
Laurent Destailleur
7ce2bb0d48
Fix: On ne gere pas de pagination sur la page des impayees.
2007-11-11 18:13:35 +00:00
Laurent Destailleur
a70ced9753
Oubli du param sortorder dans les appels de print_liste_field_titre
2007-11-11 15:55:45 +00:00
Laurent Destailleur
fa5d822e76
On rend bouton selection contact inactif si aucun contact défini.
2007-11-04 18:34:16 +00:00
Regis Houssin
e9c01bcfd7
modification de mon adresse mail
2007-11-01 20:39:36 +00:00
Laurent Destailleur
51468b6c0a
Fix: Regression. Le contact doit toujours apparaitre dans la liste des contacts car il doit pouvoir etre sélectionner pour un autre type.
...
Fix: bug #21119 : Mettre un message d'erreur plus clair si doublon contact
2007-10-31 12:55:01 +00:00
Regis Houssin
da5c8f674d
Fix: on exclus le contact de la liste déroulante lorsqu'il est sélectionné
2007-10-29 21:13:31 +00:00
Regis Houssin
59f49589a4
Fix: vu qu'on affiche toutes les factures impayées avec le total on n'affiche plus les flèches de navigation
2007-09-17 19:13:00 +00:00
Laurent Destailleur
b68ad5130b
On peut supprimer un ocntact sur la facture
2007-09-15 23:59:33 +00:00
Laurent Destailleur
9d2da43dab
Le chargement de dict se fait au meme niveau que main. Les 2 fichiers étant utilisés par la plupart des pages, sont sytematiquement charges.
2007-09-15 14:35:44 +00:00
Laurent Destailleur
119070e3ab
Qual: Utilisation de dolibarr_print_date chaque fois que c'est possible au lieu de strftime
2007-08-08 15:14:52 +00:00
Regis Houssin
f5b9db2956
Fix: uniformisation du code
2007-07-13 16:40:57 +00:00
Regis Houssin
7a9eab4ece
Add: icone pdf dans la liste des factures
2007-07-13 15:57:29 +00:00
Laurent Destailleur
293a01aecd
Fix: Pb utilisation factures recurrentes
2007-07-09 21:26:51 +00:00
Laurent Destailleur
b34c0c22be
Suite gestion des arrondis sur les montants
2007-06-21 22:56:17 +00:00
Laurent Destailleur
facf08d676
Uniformisation du mode d'appel de dolibarr_print_date
2007-06-16 13:56:05 +00:00
Regis Houssin
59a3a32f78
Fix: changement de idp en rowid pour llx_societe et llx_socpeople afin d'unifier le code.
2007-06-11 22:51:47 +00:00
Regis Houssin
3a2ae56973
Fix: mise en fonction de la vérification des droits d'accès users, clients et commerciaux
2007-06-07 14:01:35 +00:00
Regis Houssin
a713d94ecd
Fix: mise en fonction de la vérification des droits d'accès users, clients et commerciaux
2007-06-07 12:55:38 +00:00
Regis Houssin
b4c399bd9f
Fix: mise en commun des fonctions
2007-06-07 10:58:15 +00:00
Laurent Destailleur
add074c913
Qual: Uniformisation des noms de boutons actions en butAction et butActionDelete. Suppression des tabAction et butDelete qui faisait double emploi et compliqué les feuilles de styles.
2007-05-26 18:16:58 +00:00
Laurent Destailleur
402cf66d0d
Fix: free mal placé
2007-05-05 13:53:43 +00:00
Laurent Destailleur
c4e3dd3543
Doc: doxygen
2007-05-04 23:12:14 +00:00
Laurent Destailleur
93089e1482
Qual: Uniformisation du code: Suppression de la fonction img_statut au profit des methodes getLibStatut plus completes
2007-05-04 21:19:15 +00:00
Laurent Destailleur
6a365194bb
Fix: La config LDAP accepte la liste des objectClass
2007-04-13 00:35:13 +00:00
Regis Houssin
f265a205be
Fix: suppression du bouton de modification de la remise fixe + modification esthétique mineure
2007-04-02 23:47:54 +00:00
Regis Houssin
18e51b52e3
Suppression du champ "code" de la table llx_user
2007-03-10 22:14:14 +00:00
Regis Houssin
86d25e24b1
Fix: problème avec les factures récurentes
2007-01-16 22:36:24 +00:00
liedekef
40c33d355a
When defining repeatable invoices, the payment mode wasn't stored in the
...
database, so nobody could create an invoice based on this "predefined
invoice" later on.
2007-01-14 21:00:48 +00:00
liedekef
6ec1e9d298
Small language fix
2007-01-14 19:44:33 +00:00
Rodolphe Quiedeville
0ed419596f
Modif langs
2007-01-04 10:59:45 +00:00
Rodolphe Quiedeville
fccced1582
Chargement des langs 'bills'
2007-01-04 10:58:52 +00:00
Rodolphe Quiedeville
3e383e8993
Bug 18643
2007-01-03 15:13:24 +00:00
Rodolphe Quiedeville
1901f4c8c9
Mise aux normes W3C
2006-12-23 10:48:26 +00:00
Laurent Destailleur
3828073a09
Ajout pages "impayees" pour les factures fournisseurs
2006-11-18 01:16:10 +00:00
Laurent Destailleur
5e209d9f38
Qual: Factorisation du code du formulaire de soumission de document.
...
On utilise la variable $conf->upload comme limite partout
2006-11-13 22:01:35 +00:00
Laurent Destailleur
fadf293b31
Fix: Correctif bug detecté par Yannick
2006-10-22 01:43:06 +00:00
Regis Houssin
7e691e8f32
Début correction sur les factures récurrentes
2006-09-14 19:34:25 +00:00
Laurent Destailleur
f9d90c3908
Fix: Uniformisation du nom du champ id societe. On prend partout "socid".
2006-09-13 18:56:30 +00:00
Laurent Destailleur
d5869583a5
Fix: On renomme partout les proprietes tva_taux en tva_tx
2006-09-10 20:18:26 +00:00
Laurent Destailleur
1e06a25231
Qual: Tous les répertoires qui servent à générer des données temporaires (graph, fichiers rapports) sont nommés "nomdumodule/temp" pour plus de clarté et permettre fonction de nettoyage plus tard.
2006-08-19 15:50:48 +00:00
Laurent Destailleur
870cc75f6e
Sec: Les notes privées sont invisibles aux utilisateurs externes
2006-08-18 22:03:47 +00:00
Laurent Destailleur
8d2b289619
Look: Si PHP supérieur à 4.2, alors on utlise PHPlot 5.0 pour générer les graphes plutot que PHPlot 4.4.6
2006-08-13 19:07:43 +00:00
Laurent Destailleur
6523f56aa8
Simplification de la couche generant les graphs. Tous les graphs passent par la classe DolGraph.
...
C'est cette classe qui doit ensuite s'appuier directement sur PHPlot ou une autre librairie graphique libre.
Qual: La génération des soldes ne fait plus exception ce qui permet de ne plus dépendre de jpgraph qui
n'est pas libre.
2006-08-13 15:20:25 +00:00
Laurent Destailleur
e0d479a2bb
Simplification de la couche generant les graphs. Tous les graphs passent par la classe DolGraph.
...
C'est cette classe qui doit ensuite s'appuier directement sur PHPlot ou une autre librairie graphique libre.
Qual: La génération des soldes ne fait plus exception ce qui permet de ne plus dépendre de jpgraph qui
n'est pas libre.
2006-08-13 13:30:53 +00:00
Laurent Destailleur
9294334913
Qual: Déplacement des drivers de base de données de /lib dans /lib/databases pour plus de clarté.
...
New: Ajout du driver mysqli pour accéder à mysql via les fonction mysqli de la 4.1
2006-08-05 23:55:10 +00:00
Laurent Destailleur
93dd22eed8
Fix: Les fichiers .meta doivent rester invisibles à l'utilisateur
2006-07-23 01:00:31 +00:00
Laurent Destailleur
64030993c3
Look: Tous les champs de soumission de fichiers utilisent la limite $conf->maxfilesize
2006-07-13 16:18:46 +00:00
Laurent Destailleur
8ace967082
Qual: Suppression de code redondants dans facture rec car deja hérité de facture
2006-07-02 14:57:43 +00:00
Laurent Destailleur
a07c5306aa
Look: Pb largeur tableau
2006-06-29 23:51:18 +00:00
Laurent Destailleur
04d6bd1e7a
Fix: Suppression utilisation de dbclone inutile
2006-06-24 19:15:26 +00:00
Laurent Destailleur
9f6e356684
Maxi debuggage et amélioration du module expédition
2006-06-24 17:10:32 +00:00
Laurent Destailleur
8fabb7888a
Qual: Mise en facteur des methodes fetch_client et fetch_projet
2006-06-23 19:40:28 +00:00
Laurent Destailleur
b565f51c7d
Mega grosse mise en facteur de code commun.
...
Pour cela la classe CcommonObject a été crée pour héberger les methodes communes a toutes les entites métiers dolibarr (facture, contrat, propal, commande).
Ces classes métiers n'ont qu'à hériter de cette classe pour profiter du code commun.
2006-06-18 14:18:41 +00:00
Laurent Destailleur
9666db6cb7
Qual: Uniformisation du code php pour gérer les lignes de propal, facture et commande.
2006-06-16 23:55:20 +00:00
Regis Houssin
728ecbf607
Affichage de tous les aperçus
2006-06-09 15:47:20 +00:00
Regis Houssin
035073b964
Affichage de tous les aperçus
2006-06-09 15:47:20 +00:00
Laurent Destailleur
1ae88e188d
Ajout possibilité de mettre des documents sur les factures
2006-06-07 22:37:51 +00:00
Laurent Destailleur
d3ad176b82
Ajout possibilité de mettre des documents sur les factures
2006-06-07 22:18:30 +00:00
Laurent Destailleur
54ed2d2c77
Qual: Suppression des propriétés nom_url au profit de la methode getNomUrl. Ce qui permet de passer en parametre si on veut en plus le picto ou non dans le lien
2006-06-03 16:04:32 +00:00
Regis Houssin
d82fa81a0f
change le titre de l'onglet
2006-06-01 16:36:42 +00:00
Laurent Destailleur
f2ba7dbd92
Fix: Alignement tableau
2006-05-25 16:06:14 +00:00
Laurent Destailleur
f7f1c89792
Trad: Utilisation du bon terme "Réduction" au lieu de "Remise".
...
En effet une réduc en pourcentage sur une ligne facture s'appelle de manière générique "Réduction" et non "Remise" car
"Remise" est un cas particulier de "Réduction" au niveau ligne facture.
Réduction = Remise ou Rabais ou Ristourne = % sur ligne facture.
2006-05-21 00:04:52 +00:00
Laurent Destailleur
a136010830
Fix: Plantage requete sur Mysql 5
2006-05-20 10:31:55 +00:00
Laurent Destailleur
c266aef8b7
Amélioration/Simplification de la création des factures récurrentes
2006-05-01 01:08:16 +00:00
Laurent Destailleur
28e3e859e4
Fix: Warning mysql
2006-04-28 23:54:33 +00:00
Laurent Destailleur
096643cd27
Look: Ajout picto statut sur les factures clients
2006-03-19 00:39:12 +00:00
Laurent Destailleur
8e3ce6ee81
Renomme titre facture en "facture client" et corrige quelques pb alignement tableau
2006-03-14 21:31:59 +00:00
Regis Houssin
1b8e8f90aa
Ajout de la permission "consulter tous les clients" dans le module commercial, afin
...
qu'un commercial puisse voir que les clients qui lui sont affectés.
2006-03-10 15:32:56 +00:00
Regis Houssin
b0542b730b
Fix: on ne pouvait voir que la première page de l'aperçu
2006-03-01 16:21:19 +00:00
Regis Houssin
cc22914e31
Fix: l'aperçu ne fonctionnait pas en multi page
2006-03-01 13:54:21 +00:00
Laurent Destailleur
e152621539
Trad: Modification terme date limite réglement
2006-02-25 01:34:33 +00:00
Laurent Destailleur
7ace7a3b27
New: Toutes les entites (contrat, facture, propal, commande) possède un chanp note (non affiché sur PDF) et un champ note public (affiché sur PDF)
2006-02-12 16:23:43 +00:00
Laurent Destailleur
0b2724ead3
New: Toutes les entites (contrat, facture, propal, commande) possède un chanp note (non affiché sur PDF) et un champ note public (affiché sur PDF)
2006-02-12 15:54:21 +00:00
Laurent Destailleur
dbabaef6e3
Fix: Mauvaise valeur sauvegardé si montant supérieur à 1000
2006-02-08 21:09:47 +00:00
Regis Houssin
1892f451bd
Fix: onglet mal défini
2005-12-26 13:02:31 +00:00
Laurent Destailleur
27c1c42eea
Fix: Affiche message erreur sur creation prelevement
2005-12-08 23:46:32 +00:00
Laurent Destailleur
7c8b252b66
Fix: Si facture n'a pas d'auteur de renseigné
2005-12-07 02:40:37 +00:00
Laurent Destailleur
3eb18b53c9
Fix: Call to undefined function: facture_prepare_head()
2005-12-06 23:27:48 +00:00
Laurent Destailleur
0ef09f1a80
Deplace la fonction facture_prepare_head dans lib/invoice.lib.php de manière a ne l'avoir qu'une seule fois est centralisée.
2005-12-03 17:18:35 +00:00
Laurent Destailleur
bffc2d4db3
Possibilité d'ajouter des contacts à une facture durant tout son cycle de vie (pas seulement en brouillon)
2005-12-03 16:56:04 +00:00
Regis Houssin
986d669d1f
Nettoyage du code suite au test de la tache 4984
2005-12-03 12:46:07 +00:00
Laurent Destailleur
4088f7a5a3
Fix: Corrections mineures sur fonctions des contacts
2005-11-30 23:57:13 +00:00
Regis Houssin
d0721e8567
Ajout patch de la tache 4984 - merci Patrick
2005-11-30 17:37:01 +00:00
Laurent Destailleur
d5f0b976a1
Fix: Tri sur ref en cas d'égalité sur autres criteres
2005-11-12 21:10:01 +00:00
Laurent Destailleur
0def64a811
L'objet société et l'object facture brouillon sont passés a la fonction getNumRef du module de numérotation.
...
Cela permet d'avoir des modules qui numérotent en fonction des carac de la facture et du client.
2005-11-11 19:22:57 +00:00
Laurent Destailleur
9afdfbdae5
Fix: Modif esthétiques mineures
2005-10-10 20:15:32 +00:00
Laurent Destailleur
4dab301931
Fix: Restrictions accès manquantes
2005-10-08 19:13:58 +00:00
Laurent Destailleur
0f62f0ae69
Look: Possibilité d'utiliser une feuille de style css.php afin de pouvoir y inclure des images dont chemin dépend du theme.
...
Look: L'image des lignes de titre de tableau est un dégradé.
Look: Correction du bug IE qui positionne mal les onglets dans certains cas.
2005-10-02 19:20:21 +00:00
Laurent Destailleur
26bc3098af
Gestion d'evennements supplémentaires dans les triggers:
...
COMPANY_CREATE, COMPANY_DELETE, COMPANY_MODIFY
CONTRACT_VALIDATE, CONTRACT_CANCEL, CONTRACT_CLOSE
BILL_VALIDATE,BILL_PAYED,BILL_CANCEL
2005-10-01 15:57:05 +00:00
Laurent Destailleur
86811c9e3b
Optim: On evite de charger product.class si on en a pas besoin
2005-09-11 16:51:41 +00:00
Laurent Destailleur
5534aa3fba
Ajout option pour désactiver les fonctions aperçu (pour ceux qui n'ont pas imagemagick)
2005-09-10 16:15:19 +00:00
Laurent Destailleur
c5992d42af
Qual: Uniformisation du code
2005-09-10 12:55:32 +00:00
Laurent Destailleur
c333c267f3
Fix: Le warning ne tenait pas compte du délai de tolérance
2005-09-10 12:08:16 +00:00
Laurent Destailleur
f203574876
Look: Utilisation du style class="button" sur les boutons.
2005-09-06 20:58:14 +00:00
Laurent Destailleur
87cae12582
Trad: Traduction
2005-09-04 14:56:33 +00:00
Laurent Destailleur
3931aeda03
Trad: Traduction facture recurrentes
2005-09-03 13:24:20 +00:00
Laurent Destailleur
b15b7d791b
Fix: Le warning tient compte du délai de tolérance
2005-09-03 12:52:57 +00:00
Laurent Destailleur
bffcbc1673
New: Possibilité de modifier les conditions de réglements et le mode de paiement sur une facture brouillon.
2005-09-03 12:47:56 +00:00
Laurent Destailleur
05eba8caf9
Doc: Documentation doxygen
2005-09-02 21:56:45 +00:00
Laurent Destailleur
374f713f2c
Fix: bug #14364 overview: mode de reglement non pris en compte facture
2005-09-02 20:07:09 +00:00
Laurent Destailleur
e69032cf8d
Fix: Liens include invalides
2005-08-25 20:40:18 +00:00
Laurent Destailleur
d55cf878d0
Fix: Fatal error: Call to undefined function: delete() in /dolibarr/htdocs/projet/fiche.php on line 79
2005-08-12 01:34:46 +00:00
Laurent Destailleur
b30780a2da
Look: Modif esthétiques mineures
2005-08-11 20:31:07 +00:00
Rodolphe Quiedeville
5d35dd22db
Correction bug #14017
2005-08-10 07:26:04 +00:00
Rodolphe Quiedeville
3279ae8df8
Ajout methode set_auto
2005-08-02 12:45:13 +00:00
Rodolphe Quiedeville
70d1421f1c
Correction mauvaise gestion du DELETE
2005-07-30 09:32:35 +00:00
Rodolphe Quiedeville
487a76bafe
BUGFIX Correction bug #13934
...
Pertes des centimes
2005-07-30 09:31:27 +00:00
Laurent Destailleur
0812a19c5c
Qual: Uniformisation du code des pages de stats graphiques.
2005-07-16 14:56:25 +00:00
Laurent Destailleur
b1c6a1eab8
Qual: Simplification des classes de graph. Correction pb sur titre et utilisation max de la zone pour le graph.
2005-07-16 14:03:27 +00:00
Laurent Destailleur
506a5de072
Qual: Utilisation de la fonction sanitize_string pour nettoyer les noms des fichiers générés des caractères spéciaux.
2005-07-16 11:10:39 +00:00
Laurent Destailleur
3c6b2861f8
Look: Les caractéristiques complexes (projet, rib...) au sein des onglets se modifient par le bouton modifier insérer à l'emplacement même de la carac.
2005-07-16 01:00:12 +00:00
Laurent Destailleur
29bf2f1ea8
Fix: Seuil de tolerance de ratard non défini
2005-07-14 19:24:46 +00:00
Laurent Destailleur
fb13080f99
Fix: Fichier lang non chargé
2005-07-12 21:41:46 +00:00
Laurent Destailleur
3470153303
Look: L'espace du bord bas des onglets est géré comme les autres bord (par le style plutot que par un br). Ce qui permet d'avoir un rendu sans difference entre IE et Mozilla.
2005-07-11 00:49:16 +00:00
Laurent Destailleur
48acd8d39c
Trad: Traduction de la monnaie par la monnaie principale.
2005-07-10 17:46:02 +00:00
Laurent Destailleur
3087f70ecb
Look: Modif esthétique mineure
2005-07-10 17:28:43 +00:00
Laurent Destailleur
650c031a69
Trad: Traduction de "date limite de paiement"
2005-07-10 17:27:19 +00:00
Laurent Destailleur
84ea640481
Fix: Pb register globals
2005-07-09 19:12:56 +00:00
Laurent Destailleur
0ae2ef4cb3
Fix: Pb register globals
2005-07-09 19:10:45 +00:00
Laurent Destailleur
5c93dea0d6
New: Ajout onglet liste des factures liés sur fiche produit
2005-06-26 15:37:57 +00:00
Laurent Destailleur
d7af323130
Fix: Tri sur date échéance par défaut pour les impayées plutot que date création facture.
2005-06-25 23:17:27 +00:00
Laurent Destailleur
ecab16c052
Fix: Décalage cellule
2005-06-25 23:14:41 +00:00
Laurent Destailleur
d896fd9484
Qual: Ne charge la classe Notify et Adresse que si besoin
2005-06-25 22:54:02 +00:00
Laurent Destailleur
119ff44cba
Look: Utilisation du picto "Rechercher" plutot que le bouton "Rechercher"
2005-05-07 16:39:03 +00:00
Laurent Destailleur
b20639a0f2
Look: Modifications esthétiques mineures
2005-05-07 16:25:29 +00:00
Laurent Destailleur
b54232e2aa
Fix: Path incorrect
2005-05-06 00:46:07 +00:00
Laurent Destailleur
c9fa454809
Trad: Traduction message erreur Facture non trouvé
2005-04-30 15:20:09 +00:00
marc_ocebo
86fe74f45a
activation du tri sur les colonnes
2005-04-29 00:22:45 +00:00
Laurent Destailleur
7221b5e79b
Look: Utilisation feuille de style
2005-04-25 23:32:34 +00:00
Laurent Destailleur
c5ebee51fe
Look: Modification esthétique mineure
2005-04-22 23:02:44 +00:00
Laurent Destailleur
5032744c69
Fix: Liens relatifs incorrects
2005-04-13 23:33:12 +00:00
Laurent Destailleur
01c84cbb2e
Fix: Pour rendre la fonction last_insert_id compatible enre mysql et pgsql, on rend le paramètre obligatoire.
2005-03-18 23:56:41 +00:00
Laurent Destailleur
8eb28a675c
Fix: Correction mauvaise utilisation de la methode fectch_object avec en paramètre un indice au lieu d'un resultset.
2005-03-18 22:50:53 +00:00
Rodolphe Quiedeville
12932537e5
Modif l'appel de la fonction db->clone en db->dbclone
2005-03-15 20:25:19 +00:00
Rodolphe Quiedeville
901f648f4e
Bugfix
2005-03-01 16:14:59 +00:00
Rodolphe Quiedeville
8e9644dd97
Correction noms de champs
2005-03-01 15:42:57 +00:00
Rodolphe Quiedeville
97c266b64f
Ajout montant dans la liste des prélèvements
2005-02-22 11:46:40 +00:00
Rodolphe Quiedeville
07ff8d661a
Modification ordre de tri des factures
2005-02-21 14:40:24 +00:00
Laurent Destailleur
e7efe0313d
Trad: Traduction de P.U. (Prix unitaire)
2005-02-19 14:59:38 +00:00
Laurent Destailleur
8aaf21c6dd
Trad: Traduction de la chaine "Remise"
2005-02-07 20:38:33 +00:00
Laurent Destailleur
b2cdc1bc76
Qual: Toutes les images générées ou non (stats, photo utilisateurs) sont affichées à travers le wrapper viewimage.php qui fonctionne sur le même principe que le wrapper document.php pour les documents. Il permet de vérifier les droits.
2005-02-06 16:08:01 +00:00
Laurent Destailleur
96e112dda7
Trad: Traduction "Apercu"
2005-02-05 21:40:03 +00:00
Laurent Destailleur
f793994beb
New: Les images sont affichées à travers le wrapper viewimage pour éviter visualitaion sans droits.
2005-02-04 23:10:38 +00:00
Laurent Destailleur
6365f76bb3
New: Possibilité de mettre une photo sur les fiches utilisateurs.
...
New: Les images sont affichées à travers le wrapper viewimage pour éviter visualitaion sans droits.
2005-02-04 23:02:46 +00:00
Laurent Destailleur
ad107d28e6
Trad: Et encore des traductions (stock, factures)
2005-02-01 21:02:13 +00:00
Laurent Destailleur
af3e1fbf49
Trad: Encore des traductions
2005-01-31 19:32:02 +00:00
Laurent Destailleur
545c8bac11
Fix: Fichier traduction non chargé
2005-01-31 19:11:48 +00:00
Rodolphe Quiedeville
40f4d16a37
Bugfix
2005-01-31 15:14:59 +00:00
Laurent Destailleur
43b987cf26
Trad: Traduction des menus compta
2005-01-30 00:50:47 +00:00
Laurent Destailleur
bafe90bee9
Trad: Quelques traductions de plus
2005-01-19 22:52:12 +00:00
Laurent Destailleur
4e9a964174
Fix: Les factures abandonnées ne doivent pas sortir dans les impayées.
2005-01-19 20:38:05 +00:00
Rodolphe Quiedeville
46f65efbc5
Ajout lien vers les factures impayees
2005-01-18 10:11:50 +00:00
Rodolphe Quiedeville
27dda00da3
Affichage de toutes les factures et non plus par page, cette liste
...
n'ayant pas par essence a être infinie
2005-01-18 10:11:04 +00:00
Rodolphe Quiedeville
077b4d512e
Nouveau fichier
2005-01-18 10:02:26 +00:00
Laurent Destailleur
6e4a3508e4
Modif mineur sur ordre du code
2005-01-14 20:55:20 +00:00
Laurent Destailleur
f2cbc954e8
Fix: Classe project.class.php mal chargé sur l'onglet aperçu.
2005-01-14 20:38:52 +00:00
Laurent Destailleur
a7fae40345
Trad: Quelques traductions de plus
2005-01-07 21:18:52 +00:00
Rodolphe Quiedeville
8edab387ac
Ajout de la suppression d'une demande de prelevement
2005-01-07 15:56:06 +00:00
Rodolphe Quiedeville
3ad2614bc8
Ajout lien vers les prelevements
2005-01-07 14:59:11 +00:00
Rodolphe Quiedeville
a67458e7ee
Nettoayge
2005-01-07 14:48:02 +00:00
Rodolphe Quiedeville
964370faa3
Modification de l'appel de llxHeader
2005-01-07 14:47:45 +00:00
Rodolphe Quiedeville
996cd3c2a2
Ajout onglet prelevement
2005-01-07 14:38:03 +00:00
Rodolphe Quiedeville
8cc1b6ac6e
Ajout onglet prelevement
2005-01-07 14:08:57 +00:00
Rodolphe Quiedeville
aee22408ea
Synchro
2005-01-07 13:44:49 +00:00
Rodolphe Quiedeville
a2ca3f29c8
Nouveau fichier
2005-01-07 13:19:10 +00:00
Laurent Destailleur
163711871a
Fix: Utilisation du wrapper sécurisé pour tous
2004-12-31 18:12:29 +00:00
Laurent Destailleur
d701fd8b14
Fix: Utilisation du wrapper sécurisé
2004-12-31 17:03:20 +00:00
Laurent Destailleur
9b79d4e26e
Qual: Utilisation de $conf->monnaie au lieu de la constante MAIN_MONNAIE.
2004-12-04 20:19:53 +00:00
Laurent Destailleur
77ed5884da
Qual: Toutes les générations d'images se font dans un répertoire nommé $conf->module->dir_images. Cela rend uniforme le code qui des fois utilisait des chemins en dir, des fois document avec s et des fois sans.
...
Toutes les images sont dorénavant dans htdocs/images.
2004-12-04 19:07:24 +00:00
Laurent Destailleur
e58b0ef496
Uniformisation affichage onglets factures.
2004-11-26 01:02:06 +00:00
Laurent Destailleur
ad4b12c04a
Uniformisation affichage onglets factures.
2004-11-26 00:32:31 +00:00
Laurent Destailleur
933f6fb265
Fix: Le test de chargement du module fournisseur est conf->fournisseur->enabled et non conf->fourn->enabled
2004-11-16 21:23:43 +00:00
Laurent Destailleur
dafa165943
Qual: Uniformisation du code en passant tous les tableaux qui utilisaient print_liste_field_titre et print_liste_field_titre_new sur le modèle de print_liste_field_titre_new (plus complet, l'autre fonction a été supprimée).
...
Trad: Et encore de la traduction
2004-10-31 13:00:04 +00:00
Laurent Destailleur
a735e33409
Le test sur l'aperçu n'est fait que si il y a un PDF
2004-10-27 18:56:46 +00:00
Laurent Destailleur
56b10d863f
L'onglet Apercu de facture disparaissait en passant à l'onglet note ou info.
2004-10-24 22:17:28 +00:00
opensides
d63c1acb98
ça remplace le '/' par un '_' dans le nom de fichier.
...
Comme dolibarr fonctionne aussi sous windows, j'ai fait de même pour tous
les caractères interdits par windows dans les noms de fichiers.
2004-10-24 11:15:21 +00:00
Laurent Destailleur
4ce75b6a78
Fix: Correction des mauvaises utilisations des fetch_objet ou on passait un paramètre jamais utilisé.
2004-10-23 16:55:07 +00:00
opensides
ba95c1b6fc
changement de <?PHPen <?php
...
suivra l'indentation correcte du code ;-)
2004-10-19 20:35:36 +00:00
Laurent Destailleur
aba2c33ed5
Doc: Mise a jour doc doxygen
2004-10-12 22:06:55 +00:00
Rodolphe Quiedeville
876937a84f
Nettoyage du code
2004-10-07 12:21:19 +00:00
Rodolphe Quiedeville
d20e28497f
Nouveau fichier
2004-10-07 09:36:56 +00:00
Laurent Destailleur
536298fd70
Trad: Traduction de parties du modules factures
2004-09-18 17:56:30 +00:00
Laurent Destailleur
3989f58c3a
Trad: Traductions supplémentaires dans le module facture
2004-09-18 12:33:45 +00:00
Laurent Destailleur
54f066909a
Norm: Remplacement des derniers $HTTP_POST_VARS par $_POST
2004-09-04 12:55:30 +00:00
Laurent Destailleur
aba475415f
Trad: Traduction des chaines "Statistiques"
2004-09-04 12:04:44 +00:00
Laurent Destailleur
c97b99d5e4
Trad: Traduction de toutes les chaines "Description", "Type", "Status" dans tout le code.
2004-08-29 19:03:50 +00:00
Laurent Destailleur
42180e5056
Trad: Traduction de toutes les chaines "Enregistrer" et "Annuler".
2004-08-29 16:11:37 +00:00
Laurent Destailleur
2f6c530c37
Doc: Ajout commentaires pour doc doxygen
2004-08-20 01:15:55 +00:00
Laurent Destailleur
7f0ef59e7f
Doc: Les fichiers du module facture sont décrits dans doxygen.
2004-08-14 13:00:55 +00:00
Laurent Destailleur
88acbc5134
Renomage dans tout le code du mot déclaratif de fonction php "Function" (avec F majuscule)
...
par "function" (avec f minuscule), qui est le mot correct (bien que cela ne gène pas le php,
cela gène doxygen et autres outils d'analyse syntaxique).
2004-08-07 17:14:42 +00:00
Laurent Destailleur
48dc870711
Trad: Encore des traductions
2004-08-07 01:06:49 +00:00
