Laurent Destailleur
939a36428c
Merge pull request #4156 from grandoc/develop
...
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
7f3531a04c
Enhance script to track duplicate translation string and use it to
...
remove around 50 duplicates.
2015-12-06 13:34:57 +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
philippe grand
42ed3d2bb7
[Qual] Uniformize code
2015-11-18 16:05:41 +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
philippe grand
f190e5f931
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-16 08:48:07 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
philippe grand
f308606ee1
[Qual] Uniformize code
2015-11-15 07:47:35 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +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
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
eac80d7db4
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
Laurent Destailleur
ea6fe02f18
Merge pull request #3923 from altatof/customerinfos
...
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +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
Christophe Battarel
cc35f2b738
Merge branch 'develop' into customerinfos
2015-11-11 15:46:22 +01:00
Christophe Battarel
0c40a6dda5
add hidden constant
2015-11-11 15:32:42 +01:00
philippe grand
12c5d02a7a
[Qual] Uniformize code
2015-11-11 12:27:09 +01:00
Juanjo Menent
a6f0baefc1
Merge pull request #3933 from marcosgdf/bug-3980
...
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-08 11:15:31 +01:00
Laurent Destailleur
1d2dab63a3
More space
2015-11-08 02:32:22 +01:00
Laurent Destailleur
333dd10874
Add a way to lin on bank receipt tab directly
2015-11-08 02:09:32 +01:00
Laurent Destailleur
7a423c04d4
Fix The only default value is value we just entered
2015-11-08 02:00:28 +01:00
Laurent Destailleur
e350b759d3
Increase number of last bank receits visible links
2015-11-08 00:52:25 +01:00
Laurent Destailleur
b5c9602da4
Fix Use new look for left-right arrow
2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582
FIX Checkbox reconciliated no correctly checked with some Chrome
...
versions
2015-11-07 23:54:11 +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
Marcos García de La Fuente
01854b3259
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
b4c3804c91
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
2015-11-07 13:21:03 +01:00
Christophe Battarel
f52ae35dc6
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
...
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
Florian HENRY
121d2beb80
fix spacing
2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca
FIX : only active customer should be available into select list
...
thirdparty on invoice creation
2015-11-06 10:19:10 +01:00
Florian HENRY
600dbced7e
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32
FIX : only active customer should be return into new invoice creation
...
select list
2015-11-06 09:49:02 +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
Laurent Destailleur
1f4481a6b0
Merge pull request #3172 from atm-maxime/new_creditnote
...
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
2015-11-05 02:45:15 +01:00
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
563a020595
NEW Free text for cheque deposit receipt can be HTML content.
2015-11-02 20:35:33 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
3ba97627ff
FIX Default thirdparty when cloning invoice was not set.
2015-11-02 15:50:03 +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
aspangaro
d8f77f58d7
Salaries : Replace "label for" by the function fieldLabel & add some notes
2015-11-02 06:42:17 +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
Maxime Kohlhaas
bd831b1f24
Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote
2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d
FIX The price per level just never correctly manage the vat. Vat is not
...
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +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
Laurent Destailleur
461771d488
Currency is on title only.
2015-10-24 21:20:32 +02:00
Laurent Destailleur
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +02: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
Laurent Destailleur
22979523db
Try a fix for #3742
2015-10-20 02:34:53 +02:00
Maxime Kohlhaas
4de7874118
New : review customer account summary and balance
2015-10-19 20:36:25 +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
Maxime Kohlhaas
9e9f32e3bf
FIX : project was not retrieved on invoice creation form
2015-10-19 15:38:28 +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
bf6b48f5a0
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-10-18 21:17:29 +02:00
Laurent Destailleur
afe4057a97
FIX #3757 Can't set amount in a social contribution with some languages
2015-10-18 21:17:19 +02:00
Laurent Destailleur
be8e7515a1
Merge pull request #3762 from simnandez/3.8
...
Fix: Last page total is 0
2015-10-18 20:27:17 +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
Juanjo Menent
334c14d088
Fix: Last page total is 0
2015-10-18 11:56:42 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +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
8c66a7d099
Revert a bad PR. if form_confirm is replaced with formconfirm, we must
...
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
d1d6c72d7d
NEW Uniformize way of working for search filters. One filter per object.
2015-10-16 22:21:26 +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
Gauthier
b3e3cc14a7
FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test.
...
2/ Reindented code
2015-10-15 17:26:16 +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
Frédéric FRANCE
7065b2aa7d
Update account.php
2015-10-10 12:59:58 +02:00
Laurent Destailleur
eeac01b794
Merge pull request #3683 from aspangaro/develop-68
...
New : Add payment donation in accountancy expert & presentation
2015-10-09 20:25:50 +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
philippe grand
0e343ae3b2
syntax error
2015-10-08 09:34:02 +02:00
aspangaro
e0f2c41a37
Merge remote-tracking branch 'Upstream/develop' into develop-68
2015-10-07 21:08:00 +02:00
aspangaro
e1f946578b
Fix presentation
2015-10-07 21:06:55 +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
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +02:00
Laurent Destailleur
e3f225e038
FIX bad link into project box
2015-10-05 19:41:41 +02:00
Laurent Destailleur
68d4a9fc63
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-10-04 20:46:17 +02:00
Laurent Destailleur
39671d5c53
Merge pull request #3653 from frederic34/patch-11
...
Autocomplete with last conciliate number
2015-10-04 20:09:25 +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
frederic34
f2d7523091
Optioncss
2015-10-04 12:31:32 +02:00
frederic34
ed917ab447
Optioncss
2015-10-04 11:30:28 +02:00
Juanjo Menent
5deedcdb6f
Merge pull request #3577 from simnandez/dolibarr-3509
...
Issue #3509 : Ready for customers
2015-10-03 23:58:12 +02:00
Juanjo Menent
31230d296d
Merge remote-tracking branch 'upstream/3.8' into develop
2015-10-03 23:51:38 +02:00
Frédéric FRANCE
c077e69047
Autocomplete with last conciliate number
2015-10-03 20:54:27 +02:00
Laurent Destailleur
00911d1afe
Fix bad param
2015-10-03 19:05:13 +02:00
Laurent Destailleur
474bf611ad
FIX product type must be defined before used for vat calculation.
2015-10-03 18:33:46 +02:00
Juanjo Menent
9d60dee781
Issue #3509 : Ready for customers
2015-10-03 17:15:25 +02:00
Juanjo Menent
03a2fd740d
Issue #3509 : Ready for customers
2015-10-03 16:58:46 +02:00
Juanjo Menent
92f4c0d015
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
2015-10-03 16:01:24 +02:00
Juanjo Menent
553c8c0bd0
Merge pull request #3643 from frederic34/patch-12
...
Typo (broken facture.php)
2015-10-03 15:57:04 +02:00
Juanjo Menent
8da8b66693
Issue #3509 : Init works
2015-10-03 15:53:36 +02:00
Juanjo Menent
67d28d6991
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-03 14:59:56 +02:00
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
Frédéric FRANCE
8a984980ca
Type (broken facture.php)
2015-10-02 16:16:05 +02:00
philippe grand
e22fb3c538
fix : Typo
2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5
fix : Typo
2015-10-02 12:37:13 +02:00
Regis Houssin
8912e111a3
Fix: wrong date format
2015-10-02 11:21:23 +02:00
Juanjo Menent
cfa6938e5e
Merge pull request #3637 from hregis/develop_origin
...
Fix: sql error, status is an integer
2015-10-02 11:11:39 +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
Frédéric FRANCE
6e947add92
Update index.php
2015-10-02 08:58:09 +02:00
Laurent Destailleur
4201e8b032
FIX #3630 - Wrong balance report when module salaries and donation
...
disabled
2015-10-01 14:38:31 +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
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
fa9103fc97
FIX Bad title line in project view when using jmobile
2015-09-27 16:50:47 +02:00
Laurent Destailleur
fef8203e65
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-26 12:01:58 +02:00
Laurent Destailleur
a3647bea4e
Fix bad information in report
2015-09-26 11:53:36 +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
Juanjo Menent
4fa1be0e35
Issue #3509 : Init works
2015-09-26 10:37:36 +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
ad1a4c7e15
Merge pull request #3598 from GPCsolutions/formconfirm
...
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
d503dd928b
Merge pull request #3597 from GPCsolutions/displaymargin
...
[Qual] Replaced deprecated displayMarginInfos()
2015-09-26 08:47:55 +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
Juanjo Menent
7bdb5ec86e
Merge pull request #3580 from defrance/patch-80
...
fix issue #3579 : bad filtering caused by statut filter
2015-09-26 08:31:24 +02:00
Raphaël Doursenaud
485c369d55
[Qual] Replaced deprecated form_confirm()
2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
50edf63448
[Qual] Replaced deprecated displayMarginInfos()
2015-09-24 21:05:58 +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
aspangaro
918c323f8f
Salaries : Add info card / add field datec / rename field user_creat to user_author
2015-09-23 06:37:14 +02:00
aspangaro
74e46b2de3
Salaries : Add label for accessibility
2015-09-23 05:47:49 +02:00
Laurent Destailleur
da6a1d6629
NEW Introduce a method getDefaultCreateValueForField for developers to
...
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Laurent Destailleur
0821f18712
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-18 21:50:10 +02:00
Laurent Destailleur
8699776930
Better usability with dolidroid
2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09
Fix javascript error
2015-09-18 16:05:38 +02:00
Laurent Destailleur
0ef297582b
Merge pull request #3511 from marcosgdf/bug-3423
...
FIX #3423 Not possible update values of extrafields in Facture
2015-09-13 19:07:15 +02:00
Juanjo Menent
3db03ed558
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 23:45:16 +02:00
Juanjo Menent
1deb77896f
Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order
2015-09-12 23:42:48 +02:00
Laurent Destailleur
b94fb9e1f3
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 18:22:10 +02:00
Laurent Destailleur
67b7345e83
Fix the feature to log a cheque as returned.
...
Fix duplicate parameter mainmenu and leftmenu into url
2015-09-12 18:00:19 +02:00
Marcos García de La Fuente
637855485e
FIX #3423 Not possible update values of extrafields in Facture
...
Close #3423
2015-09-12 17:28:32 +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
aspangaro
15e50ecdb3
Update work
2015-09-09 21:35:41 +02:00
aspangaro
ae6f547ba5
Merge remote-tracking branch 'Upstream/develop' into develop-62
2015-09-09 20:57:28 +02:00
Laurent Destailleur
615734012e
Merge pull request #3476 from marcosgdf/refactor
...
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +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
d0c2131b09
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-08 21:32:37 +02:00
Juanjo Menent
7d88405058
Fix #3475 RemiseCheque: Undefined variable $date
2015-09-08 21:31:04 +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
Juanjo Menent
355fcc78cf
Fix #3475 RemiseCheque: Undefined variable $date
2015-09-08 20:48:31 +02:00
Marcos García de La Fuente
2f85d02911
Added missing RemiseCheque properties
2015-09-06 19:24:17 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
3c5159f497
Created Facture::hasDelay function
2015-09-05 10:56:13 +02:00
Laurent Destailleur
c03d508bd3
Merge pull request #3467 from guerrierk/develop
...
NEW Adding Document tab into Bank Account
2015-09-05 10:26:51 +02:00
Laurent Destailleur
087938e340
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/class/account.class.php
2015-09-05 10:25:01 +02:00
Laurent Destailleur
6ac4b8d0d4
Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2
2015-09-05 10:22:43 +02:00
Laurent Destailleur
4c0f117e55
Merge pull request #3465 from open-minds/patch-1
...
Fix detailed information of BBAN for Germany
2015-09-05 10:22:12 +02:00
aspangaro
967a5b2a76
Merge remote-tracking branch 'Upstream/develop' into develop-62
2015-09-05 06:18:47 +02:00
aspangaro
f33cd85c04
New: refund VAT
2015-09-05 06:15:27 +02:00
Laurent Destailleur
8bea703363
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
...
users need. I introduce a hidden option to fix this quickly.
2015-09-04 23:23:39 +02:00
GUERRIER Kevin
2395c1ca11
fix comment in file description
2015-09-04 21:58:09 +02:00
GUERRIER Kevin
a80b4703a9
Bugfix w/ Travis CI
2015-09-04 21:42:14 +02:00
GUERRIER Kevin
692fdbaec4
Adding Document tab into Bank Account
2015-09-04 21:29:16 +02:00
Laurent Destailleur
a66bcf1965
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
...
users need. I introduce a hidden option to fix this quickly.
2015-09-04 19:42:07 +02:00
Laurent Léonard
11241c51f5
Fix detailed information of BBAN for Belgium
2015-09-04 18:30:54 +02:00
Laurent Léonard
04b3c23692
Fix detailed information of BBAN for Germany
2015-09-04 18:16:43 +02:00
Laurent Destailleur
d19ec89bf1
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
2d5331b8f8
FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice
...
Close #3460
2015-09-03 12:13:03 +02:00
Marcos García de La Fuente
08565d46fe
Merge branch '3.6' into bug-2893
2015-09-03 11:56:43 +02:00
Marcos Garcí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
19ac160696
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/index.php
2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-03 10:41:44 +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
5ef3c517bc
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-09-02 16:26:09 +02:00
Laurent Destailleur
c4fa4fc931
Fix hidden feature to send remind by email
2015-09-02 16:25:21 +02:00
Raphaël Doursenaud
870882257d
Fix #3448 Pass expected date format
2015-09-01 11:06:44 +02:00
Laurent Destailleur
5fd6c44640
Fix error management
2015-08-31 13:00:24 +02:00
Laurent Destailleur
dfde0314c6
Fix bad permission
2015-08-31 12:34:59 +02:00
Laurent Destailleur
00b9f98c1c
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-31 12:15:20 +02:00
Laurent Destailleur
942723ff8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-31 12:13:35 +02:00
fmarcet
cf38b17e88
FIX: Bad visualization of suppliers name on Incomes-Expenses mode
2015-08-31 09:18:37 +02:00
Laurent Destailleur
3315978fd3
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-30 21:22:28 +02:00
Laurent Destailleur
1e3bc9f822
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
Marcos García
e4bddb4a00
NEW Added __PROJECT_NAME__ tag for customer invoice emails
2015-08-30 13:47:02 +02:00
Laurent Destailleur
47ea834516
Fix debug module expense report
2015-08-28 20:11:16 +02:00
Laurent Destailleur
4377a2d013
Fix style and sql error for field fde.ref not found
2015-08-28 18:20:51 +02:00
Laurent Destailleur
39cbd7629f
Fix error message during import
2015-08-27 23:49:25 +02:00
Laurent Destailleur
aec3976741
Fix set ref
2015-08-27 22:48:52 +02:00
Laurent Destailleur
302b61c5ce
Fix Can't download generated document for cheque summary deposit.
2015-08-27 22:43:09 +02:00
aspangaro
aff134ab65
Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr
2015-08-27 16:10:02 +02:00
Raphaël Doursenaud
33ea968b5b
Fix #3218 Bank date selectors presentation
2015-08-26 19:45:32 +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
Juanjo Menent
7befa78223
Merge pull request #3386 from grandoc/grandoc_fixes_20150815
...
the form should be outside table to avoid errors
2015-08-18 20:07:38 +02:00
Juanjo Menent
8ba1d1d414
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-18 19:59:03 +02:00
Laurent Destailleur
241bf85da2
Fix parameter sendmassremind
2015-08-18 09:53:04 +02:00
philippe grand
0432254412
the form should be outside table to avoid errors
2015-08-15 15:53:07 +02:00
philippe grand
b619aa080d
the form should be outside table to avoid errors
2015-08-15 15:47:17 +02:00
Florian HENRY
a916b75ad8
FIX : Better const usage in accountancy module
2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4
Fix TYPE_SITUATION on sell journals
2015-08-13 11:23:27 +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
Juanjo Menent
9374b4f3e3
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-08-10 12:14:18 +02:00
Marcos Garcí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
Marcos García de La Fuente
a24f29ba8b
Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php
...
Close #3341
2015-08-09 13:37:05 +02:00
Maxime Kohlhaas
0afd27e3c2
New : % of evolution on stats
2015-08-07 13:29:11 +02:00
Juanjo Menent
05b0a9b675
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Juanjo Menent
2a67bd1f38
Fix #3314 Display state in bank account card
2015-08-01 14:43:04 +02:00
Laurent Destailleur
13dee1876a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Raphaël Doursenaud
3b9c8a685b
Fix #3314 Display state in bank account card
2015-07-29 19:29:18 +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
Marcos García de La Fuente
038f171d6c
Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
...
Close #3074
2015-07-20 12:18:30 +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 García de La Fuente
d0b1652efd
Merge branch '3.5' into bug-3206
...
Conflicts:
ChangeLog
2015-07-19 11:16:10 +02:00
Marcos Garcí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 Garcí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
b9b6abd7a8
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-18 05:29:57 +02:00
aspangaro
e8d99323d4
Fix : #3242 [Dashboard] Checks waiting for deposit bad main menu
2015-07-17 05:39:08 +02:00
aspangaro
efbaeaab5c
Fix: Show vat_by_thirdparty when module accounting is on
2015-07-15 23:24:28 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
aspangaro
26ae9a6eb7
Fix: Donation payment type don't show in card
2015-07-15 19:54:51 +02:00
aspangaro
05dcb0d1ac
Correct icon bank
2015-07-15 19:14:30 +02:00
aspangaro
4a899cd856
Typo
2015-07-15 19:13:23 +02:00
Maxime Kohlhaas
20bdfdb286
Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal
2015-07-14 11:57:47 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
Maxime Kohlhaas
9f9ba12802
New : option to allow credit note without related invoice
2015-07-08 14:32:57 +02:00
Maxime Kohlhaas
dc0a1b7fd5
New : add shortcut to create a credit note from the concerned bill
2015-07-08 14:01:30 +02:00
aspangaro
54d2a96d8e
dir DOL_URL_ROOT
2015-07-05 05:56:45 +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
b7715635a0
Merge pull request #3139 from aspangaro/develop-patch50
...
Disable button add a line in bank module when accountancy module is activated
2015-07-04 04:42:37 +02:00
Laurent Destailleur
9321272838
Uniformize code
2015-07-04 04:34:14 +02:00
Laurent Destailleur
3520c94641
Merge pull request #3131 from atm-maxime/check_rejection
...
New : Check rejection management
2015-07-04 04:20:58 +02:00
Laurent Destailleur
47f9184382
Merge pull request #3114 from aspangaro/develop-patch46
...
Forms are using the tab look, even in creation mode
2015-07-04 04:13:21 +02:00
Laurent Destailleur
bddee5d01f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 04:11:30 +02:00
Laurent Destailleur
5fafb08f91
Uniformize code
2015-07-04 04:11:16 +02:00
Laurent Destailleur
19158979ac
Merge pull request #3122 from ywarnier/tva2
...
Updates and additions to VAT reports
2015-07-04 04:05:04 +02:00
Laurent Destailleur
a49c9c299e
Merge pull request #3102 from aspangaro/develop-patch42
...
HRM area : Show Ref instead of id for expense report
2015-07-04 03:40:13 +02:00
Laurent Destailleur
9c80735310
An easier to use dictionary page to edit email template.
...
Uniformize look.
2015-07-04 03:28:52 +02:00
aspangaro
4627e72f59
Debug && PSR2
2015-07-04 00:01:40 +02:00
Maxime Kohlhaas
5d14d05ce1
Fix : Social contribution payment deletion was not deleting the bank line
2015-07-03 16:38:54 +02:00
aspangaro
111e44493a
Disable button add a line in bank module when accountancy module is activated
2015-07-03 06:48:49 +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
Maxime Kohlhaas
84be022ee1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection
...
Conflicts:
htdocs/compta/paiement/cheque/card.php
2015-07-02 13:45:32 +02:00
Yannick Warnier
3a8c93522f
Convert " " to \t to match custom coding conventions
2015-06-30 15:53:58 -05:00
Yannick Warnier
c9e3cf9fa9
Introduce checkbox for extended customers VAT report
2015-06-30 15:50:35 -05:00
Yannick Warnier
066a7acbaa
Minor - Improve PSR-2 support
2015-06-30 15:42:55 -05:00
Yannick Warnier
6cb69cdaba
Minor - Fix date column title
2015-06-30 15:42:08 -05:00
Yannick Warnier
f0db9a3c3b
Add non-local and local-only VAT customers reports to new quarterly report
2015-06-30 15:41:56 -05:00
Yannick Warnier
c3bb76340f
Improve extended quaterly VAT report
2015-06-30 15:41:00 -05:00
Yannick Warnier
0cfd513b8c
Add extended quaterly VAT report with additional information on dates and customers/suppliers
2015-06-30 15:39:15 -05:00
Yannick Warnier
8e974d024b
Fix broken old queries in VAT's quadri.php
2015-06-30 15:37:22 -05:00
Laurent Destailleur
c69a9996f1
Uniformize code
2015-06-30 15:12:15 +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
46407c1c22
Forms are using the tab look, even in creation mode
2015-06-29 21:58:38 +02:00
aspangaro
768042513d
Merge remote-tracking branch 'Upstream/develop' into develop-42
2015-06-29 06:45:24 +02:00
aspangaro
cff82a5226
Use ref instead of rowid for expense report
2015-06-29 06:41:24 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
be92f5e7a0
Fix syntax error
2015-06-27 02:31:26 +02:00
Maxime Kohlhaas
16ef029a80
Add function to manage check rejection
2015-06-26 18:50:31 +02:00
Maxime Kohlhaas
f02ba45035
Allow to fetch a payment by its associated bank line id
2015-06-26 17:29:54 +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
aspangaro
cd282568e8
Merge remote-tracking branch 'Upstream/develop' into develop-42
2015-06-26 05:39:05 +02:00
aspangaro
cb36a919b5
HRM area : Show Ref instead of id for expense report
2015-06-26 05:34:12 +02:00
aspangaro
452733263d
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
2015-06-25 06:37:26 +02:00
Juanjo Menent
fc9d54fdaa
Merge pull request #3088 from atm-maxime/develop
...
New : add stats by qty on report turnover by product (+ clean code)
2015-06-24 18:23:31 +02:00
Laurent Destailleur
bdba8f1f38
Fix courrent outstanding amount not visible
2015-06-23 23:33:25 +02:00
Maxime Kohlhaas
5e9c85c789
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-06-23 20:03:46 +02:00
Laurent Destailleur
040a643ee9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3
Time spent
2015-06-23 10:13:08 +02:00
Maxime Kohlhaas
fdf1d953a9
New : add stats by qty on report turnover by product (+ clean code)
2015-06-22 19:22:13 +02:00
Laurent Destailleur
7d1d1caf30
Debug withdraw module
2015-06-21 17:09:00 +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
4f1538f502
Introduce table llx_c_holiday_type
2015-06-21 03:19:15 +02:00
Laurent Destailleur
825369230f
Finishment of look
2015-06-20 23:33:13 +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
aspangaro
d92eab49de
Add the payment in bank module
2015-06-16 05:47:24 +02:00
jfefe
745f0f7d7e
Fix crlf
2015-06-15 14:24:24 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Regis Houssin
b96ed08260
Fix: select date problem with mobile device ( #3039 )
2015-06-14 12:46:27 +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
Juanjo Menent
0596be1656
Merge pull request #3008 from hregis/develop_strict
...
Fix: ereg more simple
2015-06-12 21:24:13 +02:00
Marcos García de La Fuente
200eb7b1bb
FIX Close bug #2855 Wrong translation key in localtax report page
2015-06-12 16:27:17 +02:00
fmarcet
42b04102ba
New: Add due date filter on invoices lists
2015-06-11 12:40:16 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Regis Houssin
3fd7c26cf1
Fix: disable hook calling
2015-06-11 07:52:58 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +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
Laurent Destailleur
f7eaf35d30
NEW When creating order, proposal or invoice from thirdparty card, the
...
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
2015-06-03 11:55:39 +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
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
03c06b3cf8
Merge pull request #2916 from aspangaro/develop-patch23
...
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
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
Laurent Destailleur
07ae39fc38
Merge pull request #2910 from aspangaro/develop-patch21
...
Fix: wrong link
2015-05-30 15:00:30 +02:00
phf
9f52b9e800
FIX : #2901
2015-05-29 17:27:05 +02:00
Laurent Destailleur
65c7ab7a93
Fix: Introduce error by default when function is used as a true delete
...
function.
2015-05-29 17:11:42 +02:00
aspangaro
0bd07b795f
NEW: Add tab document on salaries payment
2015-05-28 07:33:50 +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
8eee0bdf73
NEW Forms are using the tab look, even in creation mode
2015-05-27 07:41:25 +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
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
dcc197eb6b
Fix bug debian 786479
2015-05-22 17:13:32 +02:00
Laurent Destailleur
2f5d1f5965
Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal
...
Fix email cc in selectlist on propal/bill
2015-05-22 16:56:53 +02:00
Laurent Destailleur
4de46892d1
Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro
...
FIX button create payment hide if tax amount is less than 1
2015-05-22 16:53:49 +02:00
Maxime Kohlhaas
ff6708840d
Fix : facturestats was not filtering on invoice type
2015-05-22 09:23:28 +02:00
Alexis Algoud
81a919e8a3
round to price2num
2015-05-22 09:05:38 +02:00
Laurent Destailleur
fb923c0c2b
Merge pull request #2867 from aspangaro/develop-resource
...
NEW Forms are using the tab look, even in creation mode
2015-05-21 21:33:42 +02:00
Laurent Destailleur
a09563435b
Merge pull request #2840 from FHenry/develop
...
NEW : add date value filter on account records list
2015-05-21 21:22:31 +02:00
Alexis Algoud
9184b08f94
FIX button create payment hide if tax amount is less than 1
2015-05-21 16:51:21 +02:00
aspangaro
e23459d53b
NEW Forms are using the tab look, even in creation mode
2015-05-20 21:50:38 +02:00
Florian HENRY
0331ddc2de
fix spacing
2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f
fix spell
2015-05-20 11:29:35 +02:00
Florian HENRY
8fa3b8dac3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-20 11:24:49 +02:00
Florian HENRY
6e6b66e416
apply recommandation from
...
ca53d3b602 (commitcomment-11245627)
2015-05-20 11:24:23 +02:00
aspangaro
58e942681d
NEW Forms are using the tab look, even in creation mode
2015-05-20 07:03:17 +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
Florian HENRY
ee1aa3268c
working account
2015-05-19 11:55:45 +02:00
Laurent Destailleur
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Alexis Algoud
a4031a3680
if contact in sellist, it's an Id
2015-05-18 18:33:17 +02:00
Florian HENRY
a6c5a247cd
add total and title in page records banck account
2015-05-18 11:08:27 +02:00
Florian HENRY
ca53d3b602
NEW : add date value filter on account records list
2015-05-18 10:43:54 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Laurent Destailleur
1b03e348d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/annuel.php
2015-05-16 02:53:36 +02:00
Laurent Destailleur
e382999b9e
Css fix
2015-05-15 20:10:17 +02:00
Laurent Destailleur
976211b70f
Look enhancement
2015-05-15 12:53:14 +02:00
Laurent Destailleur
c33cbefad2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 11:16:29 +02:00
Laurent Destailleur
3e94cc07d2
Fight against valign="top". Minor css fixes.
2015-05-14 16:47:15 +02:00
Alexis Algoud
3dc5ffa871
FIX send mail, copy sendto don't read the list of contact
2015-05-13 18:05:26 +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
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
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
932e23ac09
[Qual] Use jQuery 'is' instead of 'prop' in conditions
2015-05-12 16:21:21 +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
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +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
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +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
4e04f75c66
Fix css
2015-04-27 02:33:44 +02:00
aspangaro
3ae8428a12
New: Add search field for value date in vat payment list
2015-04-23 07:26:09 +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
aspangaro
b35c929cad
Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp
2015-04-22 07:18:52 +02:00
aspangaro
560150fd1c
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
2015-04-22 07:15:17 +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
e476b57795
Merge pull request #2678 from defrance69/patch-60
...
add tab management on salarie payement
2015-04-21 11:15:20 +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 García de La Fuente
28b89a2dec
Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-19 18:58:56 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
BENKE Charlie
51cb680f19
Create info.php
...
add info tabs
2015-04-19 13:32:59 +02:00
BENKE Charlie
a151defc4b
Add tabs management
2015-04-19 13:28:51 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Maxime Kohlhaas
54a68116e4
Fix : prevelement with SEPA
2015-04-19 01:55:35 +02:00
Marcos Garcí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
4b84e191a6
Use popup for confirm
2015-04-19 00:49:55 +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
Laurent Destailleur
ab77158757
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
jfefe
23e5bc4f53
Add title image for bank section
2015-04-18 23:17:47 +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 García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos Garcí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 García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
9b69b64626
Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583
...
Conflicts:
ChangeLog
2015-04-18 20:10:06 +02:00
Maxime Kohlhaas
53469c803a
Typo
2015-04-18 19:08:01 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +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
246c8a01a6
Merge pull request #2611 from defrance69/patch-58
...
Update paiement.class.php
2015-04-18 15:05:16 +02:00
Juanjo Menent
2f8ed32f76
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 14:17:00 +02:00
BENKE Charlie
6eb17a79da
Update paiement.class.php
...
standardisation of the call of fetch by adding the $ref even they not realy used
2015-04-15 11:40:12 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Marcos García de La Fuente
8f0c41dbd2
Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531
Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
2015-04-12 21:55:20 +02:00
Marcos García de La Fuente
728b64e334
Fix Bug #2583 : Unable to create a bank transfer with localized numbers
2015-04-12 20:24:22 +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
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
Laurent Destailleur
ca7a7a9038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/product/stock/product.php
2015-04-08 20:43:51 +02:00
Laurent Destailleur
edd104a6bc
Merge pull request #2563 from frederic34/patch-7
...
Accounts "from" & "to" need to have same currency
2015-04-08 11:51:41 +02:00
Frédéric FRANCE
7f62892609
Display total with currency code
2015-04-08 09:19:41 +02:00
Frédéric FRANCE
856238c876
Accounts "from" & "to" need to have same currency
2015-04-08 09:09:11 +02:00
Laurent Destailleur
bb83eb0f68
Merge pull request #2561 from frederic34/patch-5
...
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 23:50:17 +02:00
Juanjo Menent
c2bc2c9ea6
Solves #2542 Bug: Contracts store localtax preferences
...
Conflicts:
htdocs/compta/facture.php
2015-04-07 20:10:27 +02:00
Juanjo Menent
1ab70a7086
Solves #2542 Bug: Contracts store localtax preferences
...
Conflicts:
htdocs/compta/facture.php
2015-04-07 20:05:56 +02:00
Juanjo Menent
35a6ed90a0
Solves #2542 Bug: Contracts store localtax preferences
2015-04-07 20:02:12 +02:00
Frédéric FRANCE
06c749942a
Update index.php
2015-04-07 18:40:19 +02:00
Frédéric FRANCE
7a2942684c
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 12:45:25 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +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
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Marcos García de La Fuente
40860a84d1
Closes #2543 : Untranslated "Contract" origin string when creating an invoice from a contract
2015-04-04 17:28:24 +02:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
c9f690904c
Merge pull request #2514 from frederic34/patch-10
...
Correction for workboard in compta/bank/index.php
2015-04-02 11:40:55 +02:00
aspangaro
309b059089
New: Add a button to purge criteria in bank lines list
2015-03-31 21:00:22 +02:00
Frédéric FRANCE
fc5d7e57a2
Correction for workboard in compta/bank/index.php
2015-03-31 18:31:36 +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
Laurent Destailleur
86603b01dd
Merge pull request #2504 from marcosgdf/constants
...
Implemented constants for some object types and statuses
2015-03-30 09:25:18 +02:00
Laurent Destailleur
b83e9ea32f
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
...
frederic34-loan
Conflicts:
htdocs/compta/bank/ligne.php
2015-03-30 02:56:26 +02:00
Marcos García de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
aspangaro
c22a563422
New: Add management for accounting account in admin donation & correct bugs
2015-03-29 21:04:20 +02:00
frederic34
b6b1617741
Work on payment loan
2015-03-29 17:53:36 +02:00
Laurent Destailleur
73b2e0bd01
Merge pull request #2471 from marcosgdf/refactor
...
refactor
2015-03-29 16:17:36 +02:00
Laurent Destailleur
661961876a
Merge pull request #2485 from aspangaro/develop-patch2
...
Fix: Missing language key
2015-03-29 15:05:37 +02:00
aspangaro
ce6df7c022
Debug
2015-03-29 09:20:32 +02:00
aspangaro
9d25a1c7ed
Fix: Missing language key
2015-03-27 06:59:21 +01:00
aspangaro
77b123cb2d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-27 06:30:35 +01:00
aspangaro
a39f81b1a6
FIXED: Correct path of loan class
2015-03-26 20:51:27 +01:00
aspangaro
b60f1e33d6
Debug
2015-03-26 06:29:16 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
Marcos García de La Fuente
3d50b41b8e
Reverted $rowid instead of $id property
2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
aspangaro
ad0f1aae6b
Move loan in htdocs
2015-03-22 20:19:22 +01:00
aspangaro
414d4c6432
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-22 18:08: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
aspangaro
b4b3c45dbc
Update works
2015-03-21 18:00:16 +01:00
aspangaro
c4a580723d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-20 06:36:06 +01:00
aspangaro
fa41132372
Move module Don in htdocs->donations
2015-03-19 05:22:42 +01:00
aspangaro
4e68586389
Move module Dons in htdocs>donations
2015-03-19 05:08:23 +01:00
aspangaro
dbeccf7653
Update work
2015-03-18 21:56:00 +01:00
Laurent Destailleur
6ceda02eaa
NEW: Enhancement of module 'Notification by Email'. Show nb of
...
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
cd2fc2f890
Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook
...
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
2015-03-18 14:31:37 +01:00
aspangaro
e6d9d18f25
Update work on donation
2015-03-18 06:29:10 +01:00
aspangaro
4e83952485
Add payment on donation
2015-03-18 05:07:32 +01:00
Laurent Destailleur
6e251690ab
Doxygen
2015-03-17 11:23:45 +01:00
aspangaro
03bf12bdc0
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-16 06:32:11 +01:00
aspangaro
1cd81f0e81
Work on module donations
2015-03-16 06:29:15 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos Garcí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 García de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
Laurent Destailleur
c45ec24958
Merge pull request #2379 from atm-maxime/develop
...
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
2015-03-14 14:08:38 +01:00
Juanjo Menent
a2adeb2807
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
...
159
2015-03-14 10:17:41 +01:00
Juanjo Menent
851cae80a2
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
...
159
2015-03-14 10:16:50 +01:00
Maxime Kohlhaas
3578ca8baa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-11 08:52:09 +01:00
aspangaro
3897e65425
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-11 05:28:59 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Laurent Destailleur
e8732df747
Merge pull request #2441 from aspangaro/develop-ReviewER
...
FIXED: Review Expense Report
2015-03-11 02:14:13 +01:00
Maxime Kohlhaas
05a2a6af00
FIX : [bug #1900 ] Unable to remove a salary with enough permissions
2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
6f9fb6a282
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-10 15:18:08 +01:00
Maxime Kohlhaas
f90df57dc5
New : disallow social contribution modification if paid
2015-03-10 14:49:36 +01:00
Maxime Kohlhaas
db4bbf46fc
New : allow to edit social contribution amount
2015-03-10 14:43:13 +01:00
Laurent Destailleur
209f8946d0
All files must be lowercase
2015-03-10 14:17:58 +01:00
Laurent Destailleur
d847f9581e
Fix generation of RUM number. Show it on card to help debug.
2015-03-10 11:31:23 +01:00
Laurent Destailleur
2ea3eb3505
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-10 10:12:08 +01:00
Laurent Destailleur
dc30092290
Add column to store salary ref when doing payment.
2015-03-10 10:11:51 +01:00
Laurent Destailleur
90abe5cdf9
NEW: Add current salary on list of payment
2015-03-10 09:29:24 +01:00
aspangaro
f3258d59c6
Uniformize status & add price()
2015-03-08 07:21:07 +01:00
Laurent Destailleur
3894a48ffd
Fix: bad CSS
2015-03-08 02:37:25 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
aspangaro
8c6a50554e
Debug of Frederic34. Thanks !
2015-03-05 20:37:36 +01:00
aspangaro
11704e0807
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-05 20:24:53 +01:00
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
Laurent Destailleur
8e29dcdb79
Some fix after merging bank account number form
2015-03-04 21:59:03 +01:00
Laurent Destailleur
40adbe5a72
Merge pull request #2420 from aspangaro/develop-patch17
...
NEW: [T1848] Merge bank card & account card
2015-03-04 21:09:28 +01:00
Marcos García de La Fuente
4c08d34bb5
Standardized $rowid as property
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
ad72425291
Moved some variables from FactureLigne to CommonInvoiceLine
2015-03-04 10:37:43 +01:00
Laurent Destailleur
fa2e57eaa3
pcpcs
2015-03-04 01:10:23 +01:00
aspangaro
022d051726
Typo
2015-03-03 06:32:46 +01:00
aspangaro
42e43791ef
Add ajax for type on edit mode
2015-03-03 06:20:09 +01:00
aspangaro
fafebf5b2a
NEW: [T1758] Merge bank card & account card
2015-03-02 22:44:11 +01:00
aspangaro
c119ce382e
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-02 21:05:38 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
3475433eaf
Fix: the bank information were visible into pdf but were not using
...
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Laurent Destailleur
9b2a90b468
Fix: all home area pages has the search box first.
2015-03-02 00:43:17 +01:00
Laurent Destailleur
ef89ff6601
Merge pull request #2402 from aspangaro/develop-patch14
...
NEW: Add a search field and report on hrm area
2015-03-02 00:41:43 +01:00
Laurent Destailleur
f81cb81e67
Merge pull request #2405 from frederic34/patch-5
...
phpcs
2015-03-02 00:31:50 +01:00
Laurent Destailleur
2795d27cc9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
htdocs/projet/index.php
2015-03-01 16:13:22 +01:00
Laurent Destailleur
9b0dce2e34
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/agenda.lib.php
2015-03-01 13:58:56 +01:00
Laurent Destailleur
a421564b84
Fix phpcs
2015-03-01 13:52:58 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
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
804058c25e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-28 18:10:54 +01:00
Frédéric FRANCE
eb2cc110fc
phpcs
2015-02-28 10:49:14 +01:00
aspangaro
78af862c19
NEW: Add a search field and report on hrm area
2015-02-28 08:46:40 +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
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Juanjo Menent
856c8f24de
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:13:24 +01:00
Juanjo Menent
7ca8fdb20c
PHP norms
2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47
Fix: Bad SEPA xml file creation
2015-02-27 17:55:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +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
aspangaro
4803a1fb89
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-25 06:59:27 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
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
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Laurent Destailleur
6e66197621
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-20 23:49:06 +01:00
Laurent Destailleur
9e078b32d2
Fixes the way the RUM number is generated. Start phpunit test.
2015-02-20 18:35:52 +01:00
Laurent Destailleur
49cb36461c
Typo
2015-02-20 15:54:16 +01:00
Frédéric FRANCE
b73f1eb827
Update account.class.php
2015-02-19 08:40:38 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Laurent Destailleur
ead6b4bf95
Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1830
Conflicts:
ChangeLog
2015-02-18 22:50:12 +01:00
Laurent Destailleur
89b9364837
Merge pull request #2337 from marcosgdf/bug-1822
...
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
2015-02-18 22:23:07 +01:00
frederic34
4bbbff8d69
Add BIC/SWIFT Validation
2015-02-17 22:04:16 +01:00
frederic34
f652cf4e97
Add translation for IBAN Valid or not
2015-02-17 17:02:38 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Laurent Destailleur
b00de9707a
Work on expensereport module
2015-02-15 19:13:16 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Laurent Destailleur
bedaa483ad
br useless
2015-02-14 20:40:10 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
6531a5c6c7
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
2015-02-10 09:44:27 +01:00
Marcos García de La Fuente
d9ac21ab82
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
2015-02-08 16:54:41 +01:00
Maxime Kohlhaas
db9d727eb8
FIX : Link to user was wrong on bank transaction card
2015-02-08 12:36:55 +01:00
Laurent Destailleur
381af3e6bc
Field amount must be right aligned
2015-02-08 00:32:49 +01:00
Laurent Destailleur
24ad1afdd2
Merge pull request #2335 from atm-alexis/3.7
...
FIX empty discount where created if amount is null
2015-02-08 00:07:48 +01:00
Laurent Destailleur
aac584afda
Merge pull request #2320 from defrance69/patch-46
...
Update paiement.class.php
2015-02-07 23:46:40 +01:00
Alexis Algoud
0ca6661e69
FIX empty discount where created if amount is null for a line with a different tva
2015-02-07 23:42:35 +01:00
Laurent Destailleur
ef31ca9b84
New: Add balance of each account statement.
2015-02-07 23:32:46 +01:00