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
d8216a09e1
Fix: Try a fix to avoid error on big sql
2013-10-31 14:39:41 +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
Laurent Destailleur
197ae822d4
Merge pull request #1263 from FHenry/develop
...
Fix list propal and invoice to display customer ref if option is set
2013-10-26 17:13:07 -07:00
Florian Henry
17df92c654
Fix [ bug #1116 ] Silent Warning when validating a customer invoice
...
[PostgreSQL]
2013-10-26 16:01:02 +02:00
Laurent Destailleur
837d5f2e76
Qual: Normalize code of vat class
...
New: Can enter a vat payment of zero.
2013-10-25 19:27:38 +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
315e2e4c13
Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
...
defrance69-patch-14
Conflicts:
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +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
a8f784083c
Show ref with label on bank account.
2013-10-16 19:00:00 +02:00
Laurent Destailleur
07d04b7905
Fix: syntax error
2013-10-14 16:12:07 +02:00
Maxime Kohlhaas
0994184bf9
Fix invoice fetch on payment page
2013-10-14 09:45:32 +02:00
Maxime Kohlhaas
387e0ab50b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2013-10-14 09:42:10 +02:00
Laurent Destailleur
303cad162b
Qual: Show the rule name used to make calculation and link to change
...
rule.
2013-10-10 19:33:49 +02:00
Laurent Destailleur
383ead9234
Fix: remove a test output
2013-10-10 17:30:28 +02:00
Maxime Kohlhaas
d6da871381
Add object declaration on paiment
2013-10-10 09:31:37 +02:00
Laurent Destailleur
a11a0d6491
Fix: debug replanishment feature
2013-10-09 21:09:15 +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
BENKE Charles
53531ff847
Update facture.php
2013-10-06 17:23:31 +02:00
BENKE Charles
ca0ba99eff
Update facture.php
2013-09-27 22:08:06 +02:00
BENKE Charles
fff1309cec
Update facture.php
2013-09-27 22:06:05 +02:00
Maxime Kohlhaas
4a20a29521
Add hook on paiementcard + fix hook on expedition
2013-09-27 11:00:25 +02:00
Maxime Kohlhaas
383e07d102
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2013-09-26 18:20: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
5341811ec0
Fix: Clean awful code
2013-09-23 12:31:10 +02:00
Maxime Kohlhaas
00cb2aa26c
Fix : wrong var used in bank account class
2013-09-23 10:55:44 +02:00
Laurent Destailleur
b57ed72fc1
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
Laurent Destailleur
16396b985b
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885
Fix: Calculation of deposit amount when using a percent was done only on
...
last line.
2013-09-21 10:53:46 +02:00
Laurent Destailleur
53979ad58c
Fix: Bad param
2013-09-20 14:29:09 +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
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Cédric Salvador
0c93c6f0b1
format
2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f
indentation
2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34
don't display warehouse selection if there's only one
...
Conflicts:
htdocs/compta/facture.php
htdocs/langs/en_US/stocks.lang
htdocs/langs/fr_FR/stocks.lang
2013-09-09 09:55:51 +02:00
Laurent Destailleur
74a50d8d6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-07 19:51:00 +02:00
Laurent Destailleur
082cf0b487
Revert "Avoid silly assignment"
...
This reverts commit fa51e310b8 .
2013-09-07 19:27:35 +02:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +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
Raphaël Doursenaud
fa51e310b8
Avoid silly assignment
2013-09-05 17:19:30 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Florian Henry
853758a422
REplicate extrafield value
...
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e
All deposit inoice form order
2013-08-30 10:46:05 +02:00
Laurent Destailleur
b39046ca7e
Fix: Add missing syslog
2013-08-28 13:05:14 +02:00
Laurent Destailleur
7f549e60f2
Fix: Bad selection of years into graphics
2013-08-27 12:02:33 +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
67892575be
Merge pull request #1167 from PaulPoulain/999-develop
...
T999-develop: link invoice to a command
2013-08-25 03:23:57 -07:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
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
lalaina rasamoelina
f913422e62
T999-develop: link invoice to a command
...
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
2013-08-22 10:17:03 +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
Christophe Battarel
29d329a1d2
ability to define margin rate on quotes, orders, invoices
...
more to come : same on edit, user permissions
2013-08-12 15:34:09 +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
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
218e9f5b33
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-08-05 18:55:38 +02:00
Laurent Destailleur
2336a260d3
New: Add line "minimum amount desired into bank graph".
2013-08-05 18:54:03 +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
Maxime Kohlhaas
229c2d890f
Add possibility to define default VAT accountancy code for purchase
2013-08-02 10:43:53 +02:00
Laurent Destailleur
37592afa7e
New: Add hidden option BANK_DISABLE_DIRECT_INPUT
2013-07-31 18:40:09 +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
385d3612c5
Merge pull request #1136 from jfefe/extrarequired
...
Missing checks on extrafields
2013-07-27 03:09:44 -07:00
jfefe
bddbc6f6b2
Fix : show input fields if missing required extrafield when editing
...
invoice
2013-07-26 16:02:48 +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
jfefe
371b40cc76
Do not create invoice if required extrafields are empty
2013-07-26 13:22:22 +02:00
Florian Henry
8721b7cfa7
Fix [ bug #1001 ] Charge sociale : état incorrect
2013-07-26 12:51:28 +02:00
Laurent Destailleur
de41e9e9c7
Qual: More responsive design
2013-07-26 12:45:31 +02:00
Laurent Destailleur
c4d3307bfa
Qual: Normalize file name.
2013-07-26 11:36:36 +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
BENKE Charles
0a1f483fd1
Update fiche.php
...
Add feature to change refnumber of bank bordereau
2013-07-21 10:10:49 +02:00
BENKE Charles
9f14ee8846
Update remisecheque.class.php
...
add change number of remisecheque feature with the real number of the bank
2013-07-21 10:08:58 +02:00
Geoffrey
27e26c872e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2013-07-19 17:33:29 +02:00
Laurent Destailleur
ad783cc4f1
Merge pull request #1112 from PaulPoulain/949-develop
...
949 Put the ref_client in the subject mail
2013-07-19 06:59:49 -07: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
Maxime Kohlhaas
9d8438ecdd
Minor fix on remisecheque display
2013-07-19 13:39:01 +02:00
Laurent Destailleur
3896cde299
Removed useless method. Prefer using generic method.
2013-07-19 13:38:57 +02:00
Maxime Kohlhaas
196bce7e11
Add link to RemiseCheque in account lines
2013-07-19 10:23:08 +02:00
Maxime Kohlhaas
efff92fe1c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb
Start work on bank sharing for multi-company
2013-07-19 09:19:20 +02:00
Maxime Kohlhaas
4aa9d92a49
Display CheckReceipt on Payment card if exists
2013-07-19 09:17:54 +02:00
Maxime Kohlhaas
7abc53698a
Add RefExt field on RemiseCheque
2013-07-19 08:54:11 +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
lalaina rasamoelina
913f4d94cc
Put the ref_client in the subject mail
2013-07-18 12:39:50 +02:00
Juanjo Menent
8bae6a774d
Merge pull request #1095 from atm-maxime/develop
...
Fix on turnover reports
2013-07-16 23:47:56 -07: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
Maxime Kohlhaas
7b5386692c
Added w/o VAT on turnover report
2013-07-16 00:30:44 +02:00
Maxime Kohlhaas
bc0a52fa71
Fix : link to invoice list + SQL was bad when several invoices had the same amount on the same thirdparty
2013-07-16 00:29:03 +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
0a3bd58645
Fix: Duplicate button
2013-07-14 03:28:19 +02:00
Laurent Destailleur
4608e07753
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/bank/account.php
2013-07-13 23:41:32 +02:00
Laurent Destailleur
3a9ffb19c3
fix: eol
2013-07-13 21:14:05 +02:00
Laurent Destailleur
73a33a6dae
Fix: Bug to delete bank line
2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35
Fix: Missing user param
2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f
Fix: Bug to delete bank line
2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235
Fix: Missing label
2013-07-13 17:25:10 +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
1ee67bd5b9
Prepare code to uniformize method addline.
2013-07-10 16:07:57 +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
Florian Henry
1580f92b11
Fix bug for PGSQL Migration 3.4->3.5
...
Fix bug on create invoice from contract
2013-06-27 08:09:28 +02:00
Maxime Kohlhaas
76870622e4
Add turnover report by product / serv
2013-06-25 14:54:29 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Maxime Kohlhaas
0d3b7f1a0f
merge
2013-06-24 10:01:23 +02:00
Laurent Destailleur
b49a1168e3
Fix: Use div for tables when there is a different form on each line.
2013-06-23 18:33:03 +02:00
Laurent Destailleur
1d2f09688e
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064
Fix: Css for fieldset
2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9
Fix: W3C
2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6
Fix: Search filter was lost
2013-06-23 13:00:02 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Marcos García
4532399026
CR Fix
...
I'm getting tired of these commits...
2013-06-19 09:26:20 +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
simnandez
684c086ad0
Fix: param must be a string
2013-06-14 15:37:28 +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
Laurent Destailleur
0c9bc2ac5f
Merge branch 'develop' of https://github.com/frederic34/dolibarr into
...
frederic34-develop
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2013-06-12 10:47:56 +02:00
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 García
cf6bfcc9c4
Missing translations
2013-06-08 20:31:39 +02:00
Marcos García
3cff899b44
Removed debug message and wrong translation key
2013-06-08 20:01:51 +02:00
Marcos Garcí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
simnandez
26b36f3a4e
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:10:31 +02:00
simnandez
097fbaacd0
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:30 +02:00
simnandez
a4841dacda
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:13 +02:00
Laurent Destailleur
4133bfc3a4
Fix: Ton of bugs into bank categ editor (W3C, update error, syntax
...
error...)
2013-05-31 11:15:13 +02:00
Florian Henry
7c56da05b8
Add hook on propal/order/incoive list
2013-05-28 18:35:15 +02:00
simnandez
8d9b1e4788
Fix: Show date formatted
2013-05-22 10:51:45 +02:00
Laurent Destailleur
12681994ea
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Laurent Destailleur
6db07ac2d8
Fix: Several bugs into filter on statistics pages.
2013-05-20 19:24:27 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
fhenry
e19e9e1c63
Add dol_syslog
2013-05-17 21:27:15 +02:00
Laurent Destailleur
bbb843ec58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925
New: Add balance before and after column
2013-05-15 19:30:32 +02:00
simnandez
2981d4a1ec
Fix: Remove windows CR/LF
2013-05-15 18:14:37 +02:00
Laurent Destailleur
3a11e0baad
New: Script export-bank-receipts should be ready for test.
2013-05-14 23:59:59 +02:00
Laurent Destailleur
d92b46c9f9
Fix: Label missing
...
Fix: Cancel not working
2013-05-14 23:41:57 +02:00
Laurent Destailleur
fe9e8aab5e
Fix: Label missing
...
Fix: Cancel not working
2013-05-14 23:39:17 +02:00
Laurent Destailleur
d7e9236455
Fix: Missing include
2013-05-14 01:31:04 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
559bbdf19a
Merge pull request #944 from defrance69/patch-8
...
Update annuel.php
2013-05-13 15:40:43 -07:00
Laurent Destailleur
273fbdfa0e
Merge pull request #942 from FHenry/3.4
...
Remove warning if FetchObjectLinked call
2013-05-13 15:38:28 -07:00
simnandez
0c853b3ebd
Fix: Some bugs on withdrawal rejects
2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee
Fix: Some bugs on withdrawal rejects
2013-05-13 17:15:23 +02:00
simnandez
050ca946e9
Fix: Debug of withdrawals rejects
2013-05-13 16:30:52 +02:00
Laurent Destailleur
2c05d99742
Qual: Uniformize code
2013-05-12 20:10:16 +02:00
simnandez
dbb0fa09ff
Fix: Debug of withdrawals rejects
2013-05-11 18:36:44 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
BENKE Charles
ea130724b1
Update annuel.php
...
Add Debt and Cred graphic at the bottom of the page
2013-05-10 23:16:41 +02:00
simnandez
d228005e17
Fix: Remove windows CR/LF
2013-05-10 17:43:55 +02:00
fhenry
8542a4fd28
Fix date extrafield message old datetimeformat use message in log
2013-05-10 16:34:14 +02:00
Laurent Destailleur
d1d9a65de5
Merge pull request #940 from aponzio/develop
...
Fixed odd translation
2013-05-10 07:31:44 -07:00
Alessandro Ponzio
0817d035a3
Updated SQL query that fetches invoices by adding the 'ORDER BY' clause
2013-05-10 14:38:15 +02:00
simnandez
bf043fc845
Fix: Remove windows CR/LF
2013-05-08 09:28:05 +02:00
fhenry
37a9686921
Fix bug [ bug #884 ] Warnings on /compta/bank/index.php
2013-05-07 17:06:10 +02:00
fhenry
de4b9b01bf
Fix Bug [ bug #880 ] Prelevement section is broken
2013-05-07 15:34:40 +02:00
Marcos García
44ef25a367
Converted recent changes to UTF-8 encoding
2013-05-06 18:10:41 +02:00
BENKE Charles
5c766d255f
Update categ.php
...
Add update label feature
2013-05-03 16:02:04 +03:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +02:00
Marcos García
c65620ab62
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866
...
Conflicts:
ChangeLog
2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f
Enhanced fix
2013-05-03 08:16:31 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
fhenry
0dbc73a6cc
Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d
2013-05-02 22:57:42 +02:00
Marcos García
97478ccbf2
Error statut image + not translated strings
2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171
Corrected some es_ES translations and fixed problems with translations not being translated
2013-05-01 20:43:08 +02:00
Marcos García
a9e63610ae
Fixed bug #866 : Standing order from an invoice suggests invoice total amount instead of remaining to pay
2013-05-01 20:40:29 +02:00
Laurent Destailleur
5b85adfb90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/account.php
2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d
Fix: Links when transaction is withdraw has disappeared.
2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b
Fix: Links when transaction is withdraw has disappeared.
2013-05-01 02:28:14 +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
Marcos García
7a115a9216
Expedition class name was not being translated when creating invoice from it
2013-04-27 13:55:20 +02:00
fhenry
b67faf1eb1
Fix PgSQL
2013-04-26 13:01:42 +02:00
fhenry
b9f7d4c302
Fix bug on invoice extrafield type date
2013-04-26 12:20:15 +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
simnandez
9dde709c3e
Fix: typo errors
2013-04-25 13:01:38 +02:00
fhenry
bc7015a431
fix [ bug #850 ] Dolibarr PGSQL
2013-04-25 12:55:40 +02:00
Laurent Destailleur
3c5520f418
Fix: missing translation
2013-04-25 01:17: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
Laurent Destailleur
3896b99bad
Add UK with GB.
2013-04-24 19:14:59 +02:00
fhenry
23a7aae084
[ bug #841 ] Erreur compta/index
2013-04-23 14:48:34 +02:00
Regis Houssin
ccf809b14a
Fix: broken features
2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504
Fix: broken features
2013-04-22 15:09:19 +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
87ce23c4b8
Merge pull request #858 from marcosgdf/fix-notifications-alert-bug
...
Notifications popup messages were not showing real notifications that we...
2013-04-21 16:08:33 -07:00
Laurent Destailleur
9f3164d710
Merge pull request #849 from GPCsolutions/ca_report_improvments
...
Improved reports
2013-04-21 15:13:34 -07:00
Marcos García
5b248805c2
Notifications popup messages were not showing real notifications that were going to be sent
2013-04-21 14:24:19 +02:00
Raphaël Doursenaud
6cce2c0b10
Added forgotten file
2013-04-21 10:19:07 +02:00
Raphaël Doursenaud
50eb88db5d
Fixed turnover by user
...
Mistakingly used distinct in SQL request
2013-04-21 10:11:19 +02:00
Laurent Destailleur
9c11b6a246
Merge pull request #851 from FHenry/develop
...
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
2013-04-20 12:02:16 -07:00
Laurent Destailleur
a4c23b1dcd
Merge pull request #852 from marcosgdf/develop
...
Refactor + es_ES translations improvement + minor stetic change
2013-04-20 11:42:16 -07:00
Laurent Destailleur
dd13c334c7
New: Compatibility with jmobile
2013-04-20 20:30:18 +02:00
fhenry
4202c8fc91
required once instead of require
2013-04-20 17:56:39 +02:00
fhenry
cae761d522
[ task #640 ] Better deposit invoice management
2013-04-20 17:10:03 +02:00
fhenry
61b78666a2
Change-Id: I07221687a67be28376ee9146eaa46567486300ce
2013-04-20 13:29:40 +02:00
fhenry
dd8a84bce3
Fix [ bug #833 ] Accounting journals are broken
2013-04-20 13:08:06 +02:00
Marcos García
1e00ccd07d
Purchases and sellsjournal used tabs in their copyright comment. Restored 'em
2013-04-20 12:59:34 +02:00
Marcos García
c3c57351d0
Updated copyright
2013-04-20 12:57:50 +02:00
Marcos García
651b1ae7ce
Refactor + es_ES translations improvement + minor stetic change
2013-04-20 12:55:31 +02:00
Raphaël Doursenaud
f2bd1461b2
Improved reports
...
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
2013-04-20 07:33:10 +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
Maxime Kohlhaas
1381373c95
Fix : set emetteur to MYCOMPANY when payment is a customer
2013-04-18 09:24:29 +02:00
fhenry
c0c1de7992
[ task #826 ] Increasing stock when deleting an invoice
2013-04-18 08:40:29 +02:00
Regis Houssin
5c50b1db57
Fix: use empty instead isset
2013-04-17 10:42:44 +02:00
Regis Houssin
4c13a4049c
Fix: use empty instead isset
2013-04-17 10:41:54 +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
4fe49b6736
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196
Fix: bug into is_erasable function.
2013-04-16 15:00:41 +02:00
fhenry
cba73b238c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal.php
Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
d3f29649d5
Fix into div/br
2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +02:00
Regis Houssin
7177e59ea4
Fix: missing quote
2013-04-15 21:41:34 +02:00
Regis Houssin
5682e0ae25
Fix: missing quote
2013-04-15 21:40:49 +02:00
Regis Houssin
c9dba00f3f
Fix: missing current entity record
2013-04-15 21:29:49 +02:00
Regis Houssin
21056d2b78
Fix: missing current entity record
2013-04-15 21:27:01 +02:00
Laurent Destailleur
b7edb3f472
Fix: Correct css
2013-04-15 18:04:22 +02:00
Laurent Destailleur
37e54b3d80
Qual: Update copyright files.
...
Qual: Removed not used library.
Look: Uniformize css.
2013-04-15 18:00:20 +02:00
fhenry
882560dad7
Fix [ bug #821 ] 'f.facnumber' in accountancy
2013-04-15 14:34:32 +02:00
Laurent Destailleur
de2ddc02e4
Qual: Another clean of menu management system. Removed all files
...
pre.inc.php
2013-04-15 13:11:29 +02:00
Laurent Destailleur
67052933ca
Fix: PHPUnit
2013-04-14 23:42:24 +02:00
Laurent Destailleur
e5a945ba5b
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/admin/propal.php
htdocs/compta/journal/purchasesjournal.php
htdocs/compta/journal/sellsjournal.php
htdocs/core/class/conf.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/core/modules/mailings/contacts2.modules.php
htdocs/langs/ca_ES/admin.lang
htdocs/langs/en_US/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Marcos García
486425d258
Merge branch '3.3' into bug-817
...
Conflicts:
ChangeLog
2013-04-13 23:58:05 +02:00
Laurent Destailleur
7e48e341ad
Merge pull request #829 from marcosgdf/translations
...
Added missing translation
2013-04-13 14:23:07 -07:00
Marcos García
7c4b901b0a
Improved es_ES translations and replaced missing translation
2013-04-13 17:45:41 +02:00
Marcos García
a6ed2551fb
Revert "Replaced Rest not translated string with AlreadyPaid"
...
This reverts commit 580881c205 .
2013-04-13 17:13:59 +02:00
Marcos García
580881c205
Replaced Rest not translated string with AlreadyPaid
2013-04-13 17:12:16 +02:00
Marcos García
b3a035951f
[ bug #817 ] Purchases journal does not reflect localtaxes
2013-04-13 15:22:59 +02:00
Marcos García
d6b42ac879
[ bug #816 ] Sales journal does not reflect localtaxes
2013-04-13 14:44:56 +02:00
Laurent Destailleur
62893c2ae4
Qual: uniformize code to use function de set with and height for graphs
2013-04-12 17:08:54 +02:00
Laurent Destailleur
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +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
Marcos García
9ec74194a0
Translated linked object propal module name
2013-04-11 23:10:27 +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
frederic34
40f11206de
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/commande/fiche.php
2013-04-08 11:33:45 +02:00
Laurent Destailleur
8e2171b64c
Fix: Error management and missing transactions check
2013-04-07 16:39:20 +02:00
Laurent Destailleur
59dfab9d21
Fix: regresson after rename of fields
2013-04-07 15:43:21 +02:00
Laurent Destailleur
5f2ea4c65c
Merge pull request #804 from atm-maxime/develop
...
Fixes on invoice payment list and for price by quantity
2013-04-05 13:49:52 -07:00
Laurent Destailleur
a3c5db968e
Merge pull request #800 from FHenry/develop
...
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-05 13:39:52 -07:00
Laurent Destailleur
7ebd24daea
Merge pull request #805 from zedzedtop/develop
...
Develop
2013-04-05 13:28:58 -07: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
Maxime Kohlhaas
e5085b2a1c
Fix : filter on payment type was not working (int instead of char)
2013-04-04 20:19:42 +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
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Laurent Destailleur
3590ae8eaa
Merge pull request #794 from grandoc/develop
...
fix: some issue on the road to numbering supplier invoice
2013-04-02 07:07:57 -07:00
Régis Houssin
e139e63d92
Fix: missing $soc object with origin object
2013-04-02 12:01:39 +02:00
Grand Philippe
20fb7f79c0
fix: some issue on the road to numbering supplier invoice
2013-04-01 22:58:54 +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
eaff41c65f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-01 21:01:44 +02:00
Laurent Destailleur
cf4603f5af
Merge pull request #793 from jfefe/extrafields
...
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
2013-04-01 12:00:08 -07:00
Laurent Destailleur
7d32db73c6
Fix: Restore lost commit.
2013-04-01 20:59:51 +02:00
jfefe
cf6f4405cb
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
...
Conflicts:
htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8
Uniformize usage of extrafields methods
2013-04-01 19:43:26 +02:00
Grand Philippe
e2623c6ad5
try to fix :supplier invoice numbering
2013-04-01 16:04:15 +02:00
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
jfefe
e99ba51f1d
Use of new function to set optionals from add / update form
...
Format date display for data from JS calendar (date type extrafield)
2013-03-30 10:46:23 +01:00
Regis Houssin
1e3b26a104
Fix: file with a specific mask not found, again
2013-03-29 11:54:22 +01:00
jfefe
013eac1147
Better error management when add/update extrafield
...
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
simnandez
26d2e3d928
Fix: [ bug #777 ] Withdrawal receipt set Credited
2013-03-26 15:48:12 +01:00
frederic34
1cd39df82b
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1
Print IPP
2013-03-26 10:23:00 +01:00
Sébastien de Chateauvieux
148ad65150
TVA NPR : deduplicate line. Remove tva npr from journal lines
2013-03-26 08:11:06 +04: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
Laurent Destailleur
fe7cad8d6a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-24 02:28:29 +01:00
Laurent Destailleur
24427d2c65
Use combo list for revenue stamp
2013-03-24 00:35:40 +01:00
fhenry
d84cd86a50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Merge Cron module
2013-03-23 20:24:28 +01:00
Grand Philippe
2c718b740e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-23 19:09:08 +01:00
Grand Philippe
7f61061805
fix : wrong URL
2013-03-23 19:08:02 +01:00
Laurent Destailleur
fbf8d410d2
New: Support revenue stamp onto invoices
2013-03-23 17:34:23 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
eldy
90025f9c13
Work on revenue stamp
2013-03-23 13:07:25 +01:00
eldy
c8d6e9e44a
Fix: List of customers to build invoice or order
2013-03-23 12:33:25 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Grand Philippe
e506601214
display enhancement and standardize
2013-03-22 10:48:14 +01:00
Laurent Destailleur
4949d74267
New: Add a tab "consumption" on thirdparties to list products
...
bought/sells.
(i implement list for customer invoices and supplier orders, need
someone to finish work for customer orders and supplier invoices)
2013-03-22 00:02:25 +01:00
Laurent Destailleur
a2763df9e7
Qual: Start to clean the simple accountancy moule.
2013-03-20 21:41:16 +01:00
Laurent Destailleur
2da3fb68a0
Merge pull request #751 from jfefe/extrasep
...
New type of extrafield : separator
2013-03-16 07:41:34 -07:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01:00
jfefe
f16c9dd3ac
Fix : bad permission
2013-03-16 00:19:53 +01:00
jfefe
f1a05528ad
Show extrafield separator on invoice
2013-03-16 00:16:30 +01:00
Laurent Destailleur
a86c6ac39d
New: price function can show price with currency symbol.
2013-03-15 15:59:51 +01:00
Laurent Destailleur
fc3483a4bb
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/webservices/server_user.php
2013-03-12 14:55:13 +01:00
simnandez
5c4b537a65
Fix: [ bug #762 ] Bad profit calculation in Reporting
2013-03-12 11:49:15 +01:00
frederic34
9c8a9ff7dc
Print IPP
2013-03-11 23:35:31 +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
b0d7b33815
Merge pull request #715 from jfefe/extrafields
...
[ task #746 ] add extrafields support on propal object
2013-03-11 08:44:59 -07:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Laurent Destailleur
b4299ad583
Fix: Select of user
2013-03-11 14:51:19 +01:00
Laurent Destailleur
d8af59756d
New: Add function dolGetFirstLastname
2013-03-11 10:11:43 +01:00
jfefe
ba8525bd6a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
...
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
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
Laurent Destailleur
710585d4c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-07 22:40:12 +01:00
Laurent Destailleur
6cac84b222
Fix: Some fixes into reconciliate page
2013-03-07 22:39:57 +01:00
Laurent Destailleur
f62045e770
Merge pull request #720 from simnandez/develop
...
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
2013-03-07 10:58:13 -08:00
Laurent Destailleur
b060e5961b
Qual: Another step in men manager rewrite.
2013-03-07 19:47:03 +01:00
simnandez
0c8d3336c2
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
2013-03-07 18:41:56 +01:00
jfefe
dc1314f4f4
Retreive extrafield when fetch invoice
2013-03-06 05:31:19 +01:00
jfefe
3ccb0fb92c
Edit extrafields on customer invoice
2013-03-06 04:54:08 +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
Laurent Destailleur
c37e873ab4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
2013-03-05 18:32:01 +01:00
fhenry
f793ed83f6
Fix [ bug #747 ]
2013-03-04 15:36:40 +01:00
Grand Philippe
44683a0e21
english language standardization
2013-02-27 11:58:50 +01:00
Grand Philippe
79c2e17cbb
english language standardization
2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
8d7654916f
english language standardization
2013-02-23 15:46:12 +01:00
Grand Philippe
b699b79a15
english language standardization
2013-02-23 15:36:12 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Grand Philippe
182fdbce32
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-23 10:04:31 +01:00
Grand Philippe
9a431bb8e3
english standardization
2013-02-22 16:33:48 +01:00
Grand Philippe
890b9ca44a
english standardization
2013-02-22 16:27:58 +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
Grand Philippe
303577a7fa
english standardization
2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af
english standardization
2013-02-22 09:29:34 +01:00
simnandez
4cb6072f03
New: [ task #707 ] Create option ProfIdx are mandatory to validate a
...
invoice
2013-02-21 11:03:14 +01:00
Laurent Destailleur
b21cb5b899
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
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.php
htdocs/filefunc.inc.php
2013-02-17 17:25:38 +01:00
Laurent Destailleur
9a951e4d6d
Fix: When creating invoice from other object, type must be standard only
2013-02-17 17:12:19 +01:00
Laurent Destailleur
b434f58af3
Fix: When creating invoice from other object, type must be standard only
2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17
Fix: When creating invoice from other object, type must be standard only
2013-02-17 17:06:55 +01:00
Laurent Destailleur
e56e182fe9
Fix: When creating invoice from other object, type must be "standard".
2013-02-17 16:37:28 +01:00
Grand Philippe
2bfd6c40d0
fix trad : change adresse versus address
2013-02-15 19:26:09 +01:00
Maxime Kohlhaas
1cfd32680a
Fix : set some vars when invoice is back to draft status
2013-02-13 15:43:27 +01:00
Laurent Destailleur
3eb485d521
Qual: Removed TODO, deprecated code and deprecated properties. This also
...
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +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
Laurent Destailleur
9f44161e55
New: Can attach file for trip and expenses module
2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928
Fix: Note not visible
2013-01-24 12:16:00 +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
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a
Fix: [ bug #671 ] Product country origin is automatically entered in
...
description of invoices, but not in invoices generated from orders
2013-01-19 15:57:28 +01:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +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
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
simnandez
ffbb611eb4
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-13 10:57:39 +01:00
simnandez
b1369a2f01
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-12 22:08:52 +01:00
simnandez
96c5eacf4a
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-12 09:58:21 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Marcos García
be40114541
Fixed translation problems with Prelevement module
2013-01-09 21:33:55 +01:00
Regis Houssin
a7ed40b10d
Fix: empty value if combobox disabled
2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371
Fix: empty value if combobox disabled
2013-01-09 10:40:36 +01:00
Laurent Destailleur
142f171e50
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/.gitignore
2013-01-08 11:10:47 +01:00
Laurent Destailleur
ec664aaa71
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-07 00:42:02 +01:00
Laurent Destailleur
091e469050
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
...
e-mail
2013-01-07 00:40:18 +01:00
Laurent Destailleur
0f5a80a40f
Fix: Bad var name
2013-01-07 00:14:38 +01:00
eldy
2c59c6311f
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-06 21:36:39 +01:00
Marcos García
ad5d2c3459
Added missing translations, improved es_ES translations and translated untranslated text in modules admin page
2013-01-05 19:23:16 +01:00
simnandez
b4204b9c25
Fix: Withdrawal payment warning
2013-01-04 20:54:15 +01:00
simnandez
68866eaa5f
Fix: Withdrawal payment warning
2013-01-04 11:07:31 +01:00
Laurent Destailleur
4e27969317
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-02 22:15:58 +01:00
Laurent Destailleur
96416735df
Fix: [ bug #618 ] External accounts can access confidential informations
...
(a lot)
2013-01-02 18:43:59 +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
18bfceafca
Merge remote-tracking branch 'origin/3.3' into develop
2012-12-30 14:17:05 +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
2d0dea18ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/bank/search.php
2012-12-29 17:38:12 +01:00
Laurent Destailleur
a9e9b761cc
Merge pull request #560 from FHenry/develop
...
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:33:17 -08:00
Laurent Destailleur
bc489773e8
Merge pull request #559 from FHenry/3.3
...
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:32:47 -08:00
Laurent Destailleur
caf4130fb7
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2
Fix: Missing field
2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59
Merge pull request #556 from marcosgdf/3.3
...
Improved translations
2012-12-29 07:29:29 -08:00
fhenry
5099bc5e89
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 16:06:11 +01:00
fhenry
32966fe25f
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 16:02:02 +01:00
Marcos García
0c113d33a6
Removed unuseful code
...
Some lines may be marked as changed but they are not because of incorrect line endings
2012-12-29 13:12:45 +01:00
Marcos García
316552f4ea
Added missing translation and fixed references to incorrect variable
2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93
Fixed donation payment mode translation and another problem with donation edit form
2012-12-29 00:46:25 +01:00
Laurent Destailleur
f9700dc941
Fix: [ bug #651 ] FusionPDF created files cannot be deleted
2012-12-27 14:37:15 +01:00
simnandez
7cbcd1fc5d
Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is
...
mandatory
2012-12-12 17:00:29 +01:00
simnandez
488d482508
Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is
...
mandatory
2012-12-12 16:57:53 +01:00
Grand Philippe
a91a96e72e
merge
2012-12-10 10:02:13 +01:00
Maxime Kohlhaas
4cffe3e5a3
Fix : minor html fix + changelog
2012-12-07 11:06:51 +01:00
Grand Philippe
c6a3add952
fix : typo
2012-12-06 17:09:12 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Christophe Battarel
12284bf676
show local taxes on invoice
2012-11-28 12:04:31 +01:00
Regis Houssin
2d5368e135
Fix: converting line delimiters
2012-11-20 12:11:19 +01:00
Laurent Destailleur
f58d0636a1
Doxygen
2012-11-18 16:55:00 +01:00
Laurent Destailleur
eb7dc8934c
Fix: Do not loose label
2012-11-18 16:41:10 +01:00
Laurent Destailleur
fe86b5d29e
Fix: 2 other fixes on option MAIN_JS_ON_PAYMENT
2012-11-17 20:25:44 +01:00
Laurent Destailleur
5b02ff3a86
Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed
...
forced var)
2012-11-17 19:55:19 +01:00
Regis Houssin
8908f977b8
Fix: converting line delimiters !!!
2012-11-14 11:31:08 +01:00
Regis Houssin
b95ab2239f
Fix: remove unused code
2012-11-12 09:43:12 +01:00
Laurent Destailleur
f9dec36d7a
Fix: Regression
2012-11-11 15:44:02 +01:00
Laurent Destailleur
831fe6a29e
Fix: More fix about the new localtax system
2012-11-06 23:45:16 +01:00
Regis Houssin
7de5a7fd3f
Fix: compatibility with multicompany
2012-11-06 14:56:49 +01:00
Laurent Destailleur
ba56e679bd
Fix: Calculation of default date for payment term was not using
...
function.
2012-11-05 17:21:05 +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
7fd16c3a7e
Qual: Error management
2012-11-03 11:54:32 +01:00
Laurent Destailleur
118733c600
Fix: Error message type
2012-11-03 11:26:45 +01:00
Laurent Destailleur
375f464553
Fix: Option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS was not used into
...
journals.
2012-11-03 04:29:38 +01:00
Laurent Destailleur
79e3b4d792
Fix: Missing br
2012-11-03 04:02:48 +01:00
Laurent Destailleur
8709933288
Fix: Too much sanitizing
2012-11-03 00:47:09 +01:00
Laurent Destailleur
13ef8491b7
Fix: Error management
2012-10-31 15:09:42 +01:00
Laurent Destailleur
8ea48b28eb
New: More complete setup for bank ids according to countries
2012-10-31 00:46:46 +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
cbff238cbd
New: Support property "required" for extra fields.
2012-10-25 16:23:58 +02:00
Regis Houssin
446a81b4c4
Fix: move class in template
2012-10-18 10:35:55 +02:00
Laurent Destailleur
b160b97cbe
New: Add warning message.
2012-10-17 14:23:56 +02:00
Laurent Destailleur
4854c72348
Fix: [ bug #565 ] Display error bills have suppliers.
2012-10-16 19:15:36 +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
8ff506b120
Sec: Sanitize all params page, sortfield and sortorder
2012-10-13 14:47:46 +02:00
Laurent Destailleur
2a8095f3de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-13 13:03:57 +02:00
Laurent Destailleur
7385ea15db
Doxygen
2012-10-13 13:03:39 +02:00
Regis Houssin
df1e4a401a
Fix: convert line delimiters
...
Info: the last Eclipse version fix this problem
2012-10-13 11:42:58 +02:00
Regis Houssin
67f40fcd1e
Fix: works on security
2012-10-13 10:39:16 +02:00
Laurent Destailleur
091966902e
Fix: for special_code=3
2012-10-12 22:18:31 +02:00
Laurent Destailleur
4aebaf22ae
Fix: Avoid wrap on amount
2012-10-10 15:06:02 +02:00
Maxime Kohlhaas
5a64e3b1ec
Task # 104 : Commited these 2 files instead of translations files
2012-10-04 15:43:52 +02:00
Laurent Destailleur
bdb7becbc6
Fix: Try another fix on getTrad bug.
2012-10-04 09:44:04 +02:00
Maxime Kohlhaas
3ca55eb058
Task # 104 : display invoice multi order link on third party page only if there are orders to bill + translations
2012-10-02 10:52:08 +02:00
Regis Houssin
bcf46d00f0
Fix: convert line delimiters !!
2012-09-30 21:26:58 +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
81cc311844
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-09-25 21:31:20 +02:00
Laurent Destailleur
9e6defab04
Fix on total
2012-09-25 21:30:55 +02:00
Regis Houssin
d01f68a7af
Fix: try to fix codesniffer error
2012-09-25 12:07:26 +02:00
Spangaro Alexandre
a6f9111b54
Add new column in llx_c_tva
2012-09-24 07:14:37 +02:00
Spangaro Alexandre
d8481fa19b
Minor fix
2012-09-23 12:05:03 +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
Laurent Destailleur
07fa800360
Fix: Correct concat when mixing not html and html descriptions
2012-09-16 20:23:57 +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
Laurent Destailleur
2c2d17b101
Fix: Try a fix to avoid having the hover on array that should not have
...
it.
2012-09-09 13:13:24 +02:00
Laurent Destailleur
0cf89eac08
Doxygen
2012-09-08 02:17:08 +02:00
Regis Houssin
afdab32bbf
Fix: avoid warnings (strict mode)
2012-09-02 22:12:56 +02:00
Laurent Destailleur
27846d1698
Fix: Start and end date not saved at project creation
...
Conflicts:
htdocs/projet/class/project.class.php
2012-08-31 12:55:10 +02:00
Regis Houssin
f81b696890
Fix: code optimization
2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52
Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL
2012-08-31 08:51:08 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Regis Houssin
327e51ccd9
Fix: more simple
2012-08-29 17:40:13 +02:00
Laurent Destailleur
2a800816d9
Merge pull request #356 from cbattarel/develop
...
modify margin management for global discount + correct bug (wrong consta...
2012-08-28 09:24:06 -07:00
Regis Houssin
62a7847c5b
Fix: [ task #498 ] debug
2012-08-28 15:35:32 +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
10f9b53557
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-08-27 19:12:31 +02:00
Regis Houssin
3e2be54ead
Fix: restore old method
2012-08-27 19:11:44 +02:00
Laurent Destailleur
8a42cc26b7
Fix: Bad syntax of class name
2012-08-27 18:00:59 +02:00
Laurent Destailleur
a18187620e
[ bug #512 ] Filter system not working in banks > account > transactions
2012-08-26 19:23:08 +02:00
Laurent Destailleur
9c04cb25db
Qual: Removed not used files.
2012-08-26 15:51:28 +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
6a60551fdd
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into task498_objectline
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-08-23 17:19:05 +02:00
Regis Houssin
995c7f13d3
New: [ task #498 ] part3
2012-08-23 13:45:51 +02:00
Marcos García
752c867882
I like more this variable name :D
2012-08-23 09:45:52 +02:00
Marcos García
cb29cfed7b
Translations + Little refactor
2012-08-23 09:43:13 +02:00
Regis Houssin
51d3d33947
Merge pull request #339 from marcosgdf/bug-511
...
Fixed bug #511
2012-08-23 00:02:23 -07:00
Marcos García
fcb4f5ce67
Renamed MySQL alias that could cause conflicts
2012-08-23 09:00:31 +02:00
Marcos García
43e4f139d5
Fixed bug #511
...
A pagination problem was causing duplicated records
https://doliforge.org/tracker/?func=detail&aid=511&group_id=144
2012-08-23 08:21:32 +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
Regis Houssin
3cdb2ba8e1
Merge pull request #337 from marcosgdf/coding-style
...
Improved coding style
2012-08-22 22:43:03 -07:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
37c4898720
Removed "./" in require statements
...
It does not make any sense to do that
2012-08-23 01:43:44 +02:00
Marcos García
ea119c45a2
Lower-cased all <?PHP
2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Marcos García
bed4e7bc72
Fixed string being not translated
2012-08-22 22:36:08 +02:00
Marcos García
d32ed9b39c
Missing copyright
2012-08-18 18:49:18 +02:00
Marcos García
44fd4e7eb8
Fixed a SQL error when listing lines of an invoice
...
Column 'localtax1_tx' in field list is ambiguous
2012-08-18 18:47:12 +02:00
Regis Houssin
058d0b1b08
Fix: [ bug #503 ] Unable to delete linked file to a deposit
2012-08-18 08:51:52 +02:00
Regis Houssin
d03b29ba78
Fix: [ bug #502 ] Error when validating cheque deposit
2012-08-18 08:30:29 +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
Regis Houssin
b3d09478ca
Merge pull request #313 from lrq3000/develophooks
...
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
2012-08-16 08:15:19 -07:00
Regis Houssin
f714897873
Fix: limit to products and services
2012-08-15 10:34:10 +02:00
Marcos García
37332ee040
Forgot to rename the variable
2012-08-15 01:20:53 +02:00
Marcos Garcí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
Stephen L
c1d15a9572
Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches)
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 15:50:45 +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
Regis Houssin
447fc1de1a
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-08-03 20:10:01 +02:00
Regis Houssin
0d96803937
Fix: strict mode tour
2012-08-03 20:09:37 +02:00
Laurent Destailleur
6cf97a7317
Clean dead code
2012-08-03 14:18:48 +02:00
Regis Houssin
286854bf2c
Fix: [bug #478 ] Can access pages belonging to disabled modules
2012-08-03 11:56:42 +02:00
Regis Houssin
2e73cd7ddf
Fix: missing fields and compatibility with milestone
2012-08-01 17:38:10 +02:00
Laurent Destailleur
8d031900f9
[ bug #464 ] Payment form should allow to add transmitter for bank transfers
2012-07-31 13:40:38 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Regis Houssin
914087b92e
Merge pull request #275 from marcosgdf/translations
...
Minor fixes
2012-07-30 03:03:54 -07:00
Marcos García
d1cbf4f944
Fixed BIG es_ES translation problem with donations module
...
Fixed some es_ES and en_US typos
There was a string that wasn't available for translation
2012-07-30 03:18:17 +02:00
Marcos García
e26b53e8c5
Fixed a PHP fatal error warning in remisecheque.class.php
2012-07-29 21:43:19 +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
1591a5ac3b
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-07-29 15:47:40 +02:00
Regis Houssin
0aa6694c95
Fix: broken event message
2012-07-29 15:47:24 +02:00
Laurent Destailleur
e8b2489c1c
Checkstyle
2012-07-29 15:28:39 +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 García
9dc38f4382
Created rest of BackToList links
2012-07-28 21:49:47 +02:00
Marcos García
2eeaad1352
BackToList links in Financial section
2012-07-28 21:22:59 +02:00
Marcos García
a6c8838b8f
Applied patches 9-15
2012-07-27 21:27:03 +02:00
Regis Houssin
b2317fd3ee
Fix: external user confidentiality
2012-07-26 18:11:06 +02:00
Laurent Destailleur
105e91dfea
Fix: Redirect after delete to correct page
2012-07-25 15:03:06 +02:00
Laurent Destailleur
dce9b96260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/lib/repair.lib.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
a4f35bbfd5
Fix: uniformize $mesgs
2012-07-23 21:45:22 +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
8e8fd72459
correct margin infos display on order
2012-07-19 16:25:40 +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
b53d108c50
Fix: uniformize code
2012-07-11 10:14:56 +02:00
Regis Houssin
4291db4a93
Fix: strict mode
2012-07-10 18:57:27 +02:00
Regis Houssin
cd7bf41ae0
Fix: php 5.4 strict mode warning
2012-07-09 10:08:56 +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
1ddbc12258
Fix: No link if not found into table
2012-06-14 22:56:14 +02:00
Laurent Destailleur
a7d27fc711
Fix: Update was broken
2012-06-14 22:47:45 +02:00
Laurent Destailleur
daad1877a8
New: Add link to third party into sells and purchase journal.
2012-06-13 11:32:09 +02:00
Regis Houssin
06ef4ea4c4
Fix: missing end parenthesis
2012-06-11 22:38:52 +02:00
Laurent Destailleur
0739942b7e
Can add more text into title shown by getNomUrl
2012-06-11 19:28:04 +02:00
Laurent Destailleur
9a3e3e8e18
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-06-10 21:55:46 +02:00
Regis Houssin
cc18dab5c9
Fix: missing remove_file action
...
Fix: use object instead id and store odt filename in object for use in
triggers
2012-06-10 17:09:10 +02:00
Laurent Destailleur
7147994fd6
Fix: Checkstyle
2012-06-10 13:17:53 +02:00
Laurent Destailleur
ddf274e2c1
Fix: translation
2012-06-09 19:44:35 +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
Laurent Destailleur
5ab3512914
Fix: Missing permission check
2012-06-05 23:12:40 +02:00
Raphaël Doursenaud
6c963fc591
Fixed a bug preventing invoice sorting by authors
2012-06-01 03:07:05 +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
Raphaël Doursenaud
e1767d1337
Trim payment amounts
...
This allows to ignore trailing characters that may triggers a warning because the payment looks greater than what's
required
2012-05-23 12:03:02 +02:00
Regis Houssin
9cf2ea492c
Fix: broken features with external module
2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a
[ task #407 ] Manage PDF hidden items
2012-05-21 17:12:57 +02:00
Cédric Salvador
673f57edae
Fix: error in syslog call
2012-05-14 11:46:42 +02:00
Regis Houssin
8ec51c2a6b
Fix: fetch object for hookmanager
2012-05-10 19:30:10 +02:00
Laurent Destailleur
dc09960143
New: Add bank account on payment list of invoice card.
2012-05-08 15:43:58 +02:00
Laurent Destailleur
aa9648288c
Uniformize order of fileds
2012-05-08 15:01:20 +02:00
Laurent Destailleur
d5f0c487ad
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-05-07 10:36:45 +02:00
Laurent Destailleur
ad26cff69f
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-05-06 02:33:15 +02:00
Laurent Destailleur
b4f83d33a6
Merge pull request #180 from GPCsolutions/typo
...
Typo
2012-05-05 17:32:51 -07:00
Laurent Destailleur
e9fb0f427c
New: Add customer invoice ref on invoices
2012-05-06 02:27:09 +02:00
Laurent Destailleur
50944a71db
Checkstyle
2012-05-06 00:45:15 +02:00
Laurent Destailleur
f7263d1773
Fix: Do not lose filter
2012-05-05 20:07:34 +02:00
Laurent Destailleur
29c7c109fa
New: Can filter on user contact
2012-05-05 19:41:38 +02:00
Laurent Destailleur
143e524db6
New: Can filter on contact
2012-05-05 17:45:17 +02:00
Laurent Destailleur
75cefe53cf
Fix: Set payment term
2012-05-04 18:30:35 +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
Raphaël Doursenaud
9237d7b8ee
Fix: typo in unset
2012-04-26 15:32:34 +02:00
Regis Houssin
1dd12db306
Todo: Use hookmanager for external modules
2012-04-26 10:54:39 +02:00
simnandez
429851cb49
Fix: Bad include
2012-04-26 10:52:10 +02:00
Laurent Destailleur
658911b8c9
Qual: Move embeded style into css files. Add more styles.
2012-04-18 14:27:31 +02:00
Laurent Destailleur
60e9bc9e8e
Fix: Rounding
2012-04-09 01:20:33 +02:00
Laurent Destailleur
d9b12f4802
Fix: rounding
2012-04-08 23:31:54 +02:00
Laurent Destailleur
a2825eb209
Fix: [ bug #318 ] Journal des achats
2012-04-08 01:58:33 +02:00
Laurent Destailleur
f482ba18c3
Fix: We keep notes
2012-04-07 18:28:03 +02:00
Laurent Destailleur
317abb46fd
Fix: Start war bug
2012-04-07 02:24:32 +02:00
Laurent Destailleur
8f836d82cb
Fix: Better fix
2012-04-06 00:36:21 +02:00
Laurent Destailleur
3d3b939c4c
Merge pull request #145 from viniciusvgn/develop
...
Fix: Problem Loading The Type of Payment
2012-04-05 15:20:23 -07:00
Vinicius Nogueira
4be4538028
Trans: Added line that was missing
2012-04-03 23:45:00 -03:00
Laurent Destailleur
bb67c95c3d
Uniformize code
2012-04-02 20:08:08 +02:00
Laurent Destailleur
289a2afee9
Checkstyle
2012-04-02 18:29:08 +02:00
Laurent Destailleur
cf68414b21
Checkstyle
2012-04-01 20:38:22 +02:00
Laurent Destailleur
7379fd1553
New: Add link to back statement on bank line card.
2012-04-01 15:23:04 +02:00
Laurent Destailleur
79291ff610
Fix: Trans
2012-03-31 18:34:28 +02:00
Laurent Destailleur
39630db91a
New: Add filter to search on suplier ref
2012-03-31 14:21:36 +02:00
simnandez
2e7ce7647b
Fix: Sanizite data
2012-03-29 08:38:38 +01:00
Laurent Destailleur
0370e06c84
Perf: Reduce nb of requests
2012-03-28 17:34:58 +02:00
Laurent Destailleur
fbfff99b80
Fix: Can delete a paiement if bank line was deleted.
2012-03-28 17:26:53 +02:00
Laurent Destailleur
daf2a19396
New: Add signature at end of predefined email text
2012-03-28 00:56:12 +02:00
simnandez
c7bfb82999
Fix: Uniformize code
2012-03-27 08:56:37 +01:00
Regis Houssin
be7da6f52c
Fix: avoid warning in php strict mode
2012-03-23 16:44:45 +01:00
Laurent Destailleur
0fd372e5da
Trans: Update language files
...
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
2012-03-22 23:52:02 +01: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
Laurent Destailleur
ed41e03589
Qual: Fix a ton of CheckStyle errors
2012-03-18 19:23:01 +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
09e6867029
New: add view/edit notes in "deplacement" and "fichinter" cards
2012-03-16 16:01:45 +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
0df083a8d8
Fix: update security
2012-03-16 10:55:29 +01:00
Laurent Destailleur
245edb8596
Fix: Maxi debug on sending document by email. Works now with odt too.
2012-03-16 00:34:41 +01:00
Laurent Destailleur
bc94ec9cd6
Fix: We allow to add credit not higher than invoice amount.
2012-03-15 22:51:02 +01:00
Laurent Destailleur
1f0cddc464
Add hidden option to allow negative invoices (for test purpose only,
...
negative invoices should be done using credit note).
2012-03-15 22:38:55 +01:00
Regis Houssin
e86fed02fc
Fix: missing linked objects
2012-03-15 07:23:49 +01:00
Regis Houssin
777c402f62
Fix: add elseif
2012-03-13 20:21:08 +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
4f23be1b50
Qual: Removed checkstyle errors and dead code
2012-03-13 01:43:13 +01:00
Laurent Destailleur
2aa92fa249
Fix: bad class
2012-03-11 23:46:31 +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
simnandez
31125d560f
New: [ task #156 ] Create an invoice from a delivery receipt
2012-03-10 18:55:21 +01:00
Laurent Destailleur
6280605965
Fix: Move include
2012-03-10 01:06:58 +01:00
simnandez
96fc2cb8ea
Fix: Security
...
Qual: Clean data if transfer is ok
2012-03-08 12:20:47 +01:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
simnandez
f319ec7dd2
Fix: Bad sql query
2012-03-02 20:15:43 +08:00
simnandez
cda3600f7f
Fix: Security
2012-02-29 18:56:54 +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
94f6034f9a
New: adding the ability to display a different value than the original
...
value, in the edit in place fields
2012-02-22 22:05:20 +08:00
Laurent Destailleur
868f94c08b
Add style noshadow
2012-02-21 23:35:38 +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
f74440aa65
Fix: request
2012-02-20 23:51:00 +01:00
Regis Houssin
fa3e134a92
Fix: add specific right access for payment
...
New: add possibility to defined success message for jeditable
2012-02-20 20:31:35 +01:00
Laurent Destailleur
58d1a042a5
Fix: print select_societe was wrong as it contains already print
...
instructions. Use select_company instead.
2012-02-20 12:41:12 +01:00
Laurent Destailleur
8c0ad673e8
Reduce size of form.class
2012-02-20 12:31:01 +01:00
Laurent Destailleur
5540e5cb82
Qual: Reduce size of form.class
...
Qual: Removed not used file
2012-02-20 10:24:08 +01:00
Laurent Destailleur
b93c03a9c9
Qual: Doxygen
...
Perf: Reduc size of form.class.php
2012-02-20 10:09:28 +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
0a4ffe6e69
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-19 18:35:52 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Regis Houssin
95f9de6ab4
Fix: missing rowid
2012-02-19 18:00:47 +01:00
Regis Houssin
6e157e91a6
Fix: [bug #302 ]
2012-02-18 18:14:45 +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
Laurent Destailleur
c89fd4b1e7
New: Can conciliate several lines in one operation.
2012-02-15 12:16:33 +01:00
Laurent Destailleur
8eaf9602d9
Fix: If choice was forced to another value by user, we must keep choice of user
2012-02-13 20:12:03 +01:00
Regis Houssin
6f3f1204fe
Fix: delete linked object in propal delete function and uniformize code
2012-02-13 18:27:42 +01:00
Regis Houssin
f07b6397fc
Fix: test if type of paiement is cash for cash account
2012-02-13 15:18:23 +01:00
Regis Houssin
c86183e18c
Fix: uniformize code and force paiement type if cash account
2012-02-13 14:49:20 +01:00
Laurent Destailleur
cfaf1f0813
New: Can add tabs on statistics views.
2012-02-12 23:29:31 +01:00
Laurent Destailleur
8f4c5eeb9e
Fix: Stats must be on user of card not creator
2012-02-12 11:52:01 +01:00
Laurent Destailleur
d48fd7b232
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-11 20:30:46 +01:00
Laurent Destailleur
2fd870d987
Normalize code
2012-02-11 20:30:16 +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
df7dc8652d
Look: Uniformize css style usage
2012-02-10 09:54:19 +01:00
Laurent Destailleur
c1600bc4fa
Minor fix
2012-02-10 09:16:38 +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
Regis Houssin
f0d2823edf
Fix: avoid foreach warning
2012-02-06 18:59:07 +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
Laurent Destailleur
26c597878f
Amount at end.
2012-02-03 10:00:57 +01:00
Regis Houssin
3302a86f0c
Fix: add entity field in llx_paiement
2012-02-01 18:29:06 +01:00
Laurent Destailleur
0a78b3f970
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-01 14:22:35 +01:00
Laurent Destailleur
f1cd91dac5
Fix: Permission on donation module
2012-02-01 14:20:22 +01:00
Laurent Destailleur
b1e58dd454
Mutualize common code
2012-02-01 13:21:39 +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
070f157f08
Fix: Delete bank account
2012-01-19 23:31:37 +01:00
Laurent Destailleur
d9aa0c4b28
Qual: Normalize field names
2012-01-19 22:20:28 +01:00
Laurent Destailleur
a754072c85
Fix: use correct property
2012-01-18 01:31:57 +01:00
Laurent Destailleur
a8ca1c721c
Uniformize way of working of trip and expenses (added "validate" step
...
after "draft").
2012-01-18 01:05:26 +01:00
Spangaro Alexandre
28550dca89
Add function block/unblock for a trip credit note
...
Signed-off-by: Spangaro Alexandre <alexandre.spangaro@gmail.com>
2012-01-17 15:11:04 +08:00
Christophe Battarel
6a90298af0
affiche libellé produit dans la langue du client en plus de la description (variable de conf renommée en PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE
2012-01-16 17:12:29 +01:00
Christophe Battarel
5524d42ddb
ajout commentaires entete oubliés sur ajout description produit dans la langue du client
2012-01-16 10:35:36 +01:00
Laurent Destailleur
f1c2c7891b
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-01-15 19:09:26 +01:00
Laurent Destailleur
15cd3794c9
Removed comments
2012-01-15 15:16:06 +01:00
Regis Houssin
196bb42636
Fix: use MAIN_JS_ON_PAYMENT just for the auto-completion payment
2012-01-15 11:02:08 +01:00
Laurent Destailleur
e528ac97a8
fix: [ bug #272 ] Impossible afficher Créances-Dettes sur période
...
d'analyse choisie
2012-01-14 13:45:42 +01:00