STAGIAIRE-PC\Pierre
294f14ab63
Generation of the mandate file from the api
2018-07-19 15:09:32 +02:00
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Regis Houssin
3e5271967b
FIX missing entity field
2018-07-08 12:11:22 +02:00
Laurent Destailleur
3a593f88f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Laurent Destailleur
5883899bc7
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-07-05 02:33:39 +02:00
Laurent Destailleur
5583600066
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 17:37:50 +02:00
Laurent Destailleur
50df452b9e
Fix status "Supplier" not always visible.
2018-07-03 17:37:23 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Laurent Destailleur
8d3fff5568
Merge pull request #8738 from atm-quentin/NEW_triggers_commercial_add
...
NEW triggers add commercial and del commercial
2018-06-30 01:44:10 +02:00
Laurent Destailleur
0f62408700
Remove duplicated code
2018-06-30 01:34:51 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
...
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +02:00
STAGIAIRE-PC\Pierre
8a780b3910
Code refactorisation
2018-06-27 11:01:20 +02:00
STAGIAIRE-PC\Pierre
62f2108101
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-27 10:33:57 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
eb88f1e5c9
Fix look and feel v8
2018-06-23 12:41:03 +02:00
Laurent Destailleur
06342ff80c
FIX contextpage on contact list
2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
2d89d9634b
Fix search on extrafields
2018-06-20 23:16:06 +02:00
Laurent Destailleur
a73296e212
Fix reseller not saved
2018-06-19 19:34:23 +02:00
atm-ph
cb3704b67e
Fix can't add an attribute simply
2018-06-15 11:02:46 +02:00
Laurent Destailleur
a15cfd23f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-13 22:57:51 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
c5887c1ec7
Merge pull request #8399 from ptibogxiv/patch-23
...
FIX lang for support more type of stripeconnect account
2018-06-13 22:13:43 +02:00
Laurent Destailleur
aaa6565014
Merge pull request #8938 from HackLo/develop
...
FIX: Link does not work when there is spaces in SIREN
2018-06-13 21:39:54 +02:00
Laurent Destailleur
916424943e
Merge pull request #8942 from grandoc/new_branch_10_06_2018
...
New branch 10 06 2018
2018-06-13 20:48:22 +02:00
Laurent Destailleur
3ec6b88ece
Merge pull request #8958 from frederic34/listfax
...
FIX add fax to thirdparty list
2018-06-13 20:10:10 +02:00
Frédéric FRANCE
345fb1f2af
add fax to thirdparty list
2018-06-13 17:57:15 +02:00
Philippe GRAND
5021c7a556
clean and update code
2018-06-10 18:29:04 +02:00
Loïc Barouty
945b71d6af
FIX: Link does not work when there is spaces in SIREN (like in the main format)
2018-06-08 23:38:44 +02:00
Laurent Destailleur
b6955692b4
Fix autofill of password
2018-06-05 11:22:00 +02:00
Laurent Destailleur
7a8fac4198
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2018-06-04 15:14:26 +02:00
Laurent Destailleur
840330deea
Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects
...
Add supplier proposal in linkedObjects type select of the suppliers
2018-06-04 13:46:36 +02:00
Laurent Destailleur
eaee252a5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
atm-greg
0785029fe0
Add supplier proposal in linkedObjects type select of the suppliers
2018-05-31 10:46:50 +02:00
areaeuro
475297b98b
Update card.php
...
Line 714 - conditional to delete thirdparty logos
$object->photo
does not exits, and should read
$object->logo
This appears to be an oversight, as it is correct in the rest of the file
2018-05-30 12:29:02 +02:00
Laurent Destailleur
182abfdb5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
fa252d5cbd
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm
2018-05-25 11:59:22 +02:00
Laurent Destailleur
354198b31e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/contact.php
2018-05-22 20:26:09 +02:00
Laurent Destailleur
2a579b707a
FIX javascript showempty error
...
FIX Contact tab not visible when using canvas
2018-05-22 19:43:28 +02:00
Laurent Destailleur
be21405d21
Fix missing error message
2018-05-22 19:24:56 +02:00
areaeuro
11714b9b6b
Update societe.class.php
...
Line 2942 throws an error in php 7 "Warning: A non-numeric value encountered" when doing math sum, as substr() may be empty.
Convert to intval(substr()) to fix.
2018-05-18 10:27:54 +02:00
Laurent Destailleur
4f6b0fead6
Fix filter on test/live mode for stripe card
2018-05-17 15:13:16 +02:00
Laurent Destailleur
200af6ea5c
Fix stripe link
2018-05-17 09:45:31 +02:00
Laurent Destailleur
ac97ba9e36
Fix deletion of stripe card
...
Solve validation of recurring invoice
2018-05-16 20:41:01 +02:00
atm-quentin
5802eb63ec
FIX name of trigger and use of context
2018-05-07 11:36:34 +02:00
atm-quentin
04228cca82
NEW triggers add commercial and del commercial
2018-05-04 12:20:29 +02:00
Marc de Lima Lucio
b0d05b4824
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_conf_thirdparty_tag
2018-05-03 09:47:25 +02:00
Marc de Lima Lucio
bc7b05537f
NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier
2018-05-03 09:26:48 +02:00
Laurent Destailleur
3cad7c6998
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-01 12:51:46 +02:00
Laurent Destailleur
e79c907ae0
Fix edit of capital
2018-04-30 11:01:33 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
fcf91b6c8c
Look and feel v8
2018-04-24 11:12:12 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
22c6b596a7
Remove dead code
2018-04-20 15:56:10 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1
standardize code
2018-04-15 16:35:18 +02:00
Laurent Destailleur
c6f57b8ec4
Update societe.php
2018-04-13 23:29:47 +02:00
atm-quentin
ba5ac47602
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
2018-04-13 15:48:58 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
1feee6378f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 14:45:52 +02:00
Laurent Destailleur
f181719769
Can fetch a companypaymentmode of a thirdparty
2018-04-10 18:11:08 +02:00
atm-quentin
6277928b67
FIX issue #8470
2018-04-10 14:01:35 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
65996c47ff
Fix clean email syntax to remove , to avoid error RFC-5321 address
2018-04-10 11:15:21 +02:00
Laurent Destailleur
24f4d5040a
Move isInEEC from common to thirdparty class.
2018-04-09 14:25:02 +02:00
Laurent Destailleur
d5089f2099
Fix default value of sales tax is used must be set in creation
2018-04-06 20:55:02 +02:00
Laurent Destailleur
6c409b2670
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 18:08:19 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
8cf56a5b9c
Fix regression
2018-04-05 16:29:37 +02:00
Laurent Destailleur
5b50b8bd40
Merge pull request #8491 from hregis/develop_multicompany
...
Fix: possibility to change entity for new thirdparty
2018-04-05 16:11:53 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
08ab67289b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2018-04-05 13:10:11 +02:00
Regis Houssin
e09c85cfdb
Fix: possibility to change entity for new thirdparty
2018-04-01 13:45:39 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Laurent Destailleur
96c73a13f6
Clean code
2018-03-31 16:45:36 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
b6e9e0e287
Fix missing hooks
2018-03-30 16:44:58 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php
2018-03-29 13:48:09 +02:00
atm-ph
a89983ef5c
Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code
2018-03-28 15:41:10 +02:00
Regis Houssin
dec0164ff9
Fix: differentiate "card", "contact" and "agenda
2018-03-27 19:12:01 +02:00
Laurent Destailleur
6ef1dbbe0f
FIX auto open contract if one result found
2018-03-24 18:28:06 +01:00
Laurent Destailleur
d6f3fc9fe7
Fix use the getSalesRepresentative function instead of get_users
2018-03-22 16:05:50 +01:00
Laurent Destailleur
86e496963b
Merge pull request #8081 from atm-maxime/new_salesrep
...
NEW improve way of adding users/sales representative to thirdparty
2018-03-22 14:05:44 +01:00
dolibarr95
4b0eede1dd
Delete getCountry() and select field in sql query
...
Delete getCountry() and select field in sql query
2018-03-21 08:53:38 +01:00
dolibarr95
9887d38589
Add dol_print_phone
...
Add dol_print_phone in thirdparty table list.
2018-03-20 11:13:02 +01:00
Laurent Destailleur
9aa4a90543
NEW Stripe online payments reuse the same stripe customer account
2018-03-19 10:57:19 +01:00
Laurent Destailleur
9c221c10aa
Load trans
2018-03-18 21:04:16 +01:00
Laurent Destailleur
1a70e7a7c4
Triggers for Strips payment modes
2018-03-16 16:42:26 +01:00
Laurent Destailleur
f258d31a98
Triggers for Strips payment modes
2018-03-16 16:10:04 +01:00
Laurent Destailleur
e2cbf903ba
Remove deprecated code
2018-03-16 10:33:23 +01:00
ptibogxiv
a8e5927a6e
FIX lang for support more type of stripeconnect account
2018-03-16 10:07:47 +01:00
Laurent Destailleur
eb5d5d07ec
Remove the old deprecated code of doActions in canvas. The doActions of
...
hooks are already available and are better.
2018-03-16 09:58:46 +01:00
Laurent Destailleur
5a397fff72
Fix scrutinizer bugs
2018-03-16 00:16:32 +01:00
Laurent Destailleur
71c51eb789
NEW Add hook printEmail
2018-03-15 22:22:42 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Laurent Destailleur
618627f137
Merge pull request #8393 from atm-maxime/new_siret_check
...
New rule for FR siret value check
2018-03-15 14:27:59 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
ff4d60dd96
Removed no more required hidden option
2018-03-15 14:00:46 +01:00
Maxime Kohlhaas
3de6e1a6cb
Simplify SIREN check function
2018-03-15 12:02:49 +01:00
Maxime Kohlhaas
8ae90bebaf
New rule for FR siret value check
2018-03-15 09:50:33 +01:00
Laurent Destailleur
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
f0f6f71161
Fix Sqli
2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
c3b9c91200
Fix SQLi reported by op7ica
2018-03-15 01:33:46 +01:00
Laurent Destailleur
6a70d268e0
Fix SQLi reported by op7ica
2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be
Fix SQLi reported by op7ica
2018-03-15 01:21:44 +01:00
Laurent Destailleur
821a75cef0
Fix payment modes
2018-03-15 00:53:24 +01:00
Laurent Destailleur
f75334f131
Merge pull request #8386 from ptibogxiv/patch-21
...
FIX support for stripeconnect mode
2018-03-15 00:40:52 +01:00
Laurent Destailleur
87bbb4ef87
Can create card from dolibarr
2018-03-15 00:40:29 +01:00
Laurent Destailleur
c69f5843da
Update card.php
2018-03-15 00:36:56 +01:00
Laurent Destailleur
bf4a0e46aa
Add a credit card on stripe
2018-03-14 21:07:45 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
8c535db04c
Use .... before end of card number
2018-03-14 17:15:31 +01:00
Laurent Destailleur
9994b1f133
Work on stripe interface
2018-03-14 17:12:32 +01:00
Laurent Destailleur
b232681318
NEW Add a button to create Stripe customer from the Payment mode tab
2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75
Work on generic customer payment modes
2018-03-14 13:56:21 +01:00
fmarcet
5140c1c5d2
Fix: Merge categories when merging thirds
2018-03-14 13:25:05 +01:00
ptibogxiv
e179161bfa
FIX support for stripeconnect mode
2018-03-14 12:01:15 +01:00
Laurent Destailleur
268b07bcf0
Can add/delete credit card localy
2018-03-14 11:51:13 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
2018-03-14 10:49:54 +01:00
Laurent Destailleur
fe68e8acdd
Trans
2018-03-13 22:54:28 +01:00
Laurent Destailleur
da617f7d32
Can work both with remote and local payment modes
2018-03-13 22:43:50 +01:00
Laurent Destailleur
c78e5d23ea
Work on the customer payment mode tab
2018-03-13 20:23:59 +01:00
Laurent Destailleur
0258d3aeeb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 18:04:59 +01:00
Laurent Destailleur
ca809a11af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/class/commande.class.php
2018-03-13 18:04:18 +01:00
Laurent Destailleur
3f490906f9
Trans
2018-03-13 17:52:15 +01:00
Laurent Destailleur
2566170c68
Use code of societeaccount
2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8
Add unique key. Dolibarrize view of stripe card.
2018-03-13 17:32:49 +01:00
atm-quentin
af09a3714b
FIX reverse field to have object loaded in doaction
2018-03-13 17:12:03 +01:00
Laurent Destailleur
a955e74329
Better MVC
2018-03-13 15:19:31 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
cbbaf4763b
Start to introduce thirdparty website accounts
2018-03-12 16:04:23 +01:00
Laurent Destailleur
7362b3f3d7
Add table to store thirparty account in external web sites
2018-03-12 15:59:03 +01:00
Laurent Destailleur
03f7df88c6
Update card.php
2018-03-11 00:05:32 +01:00
Inovea Conseil
c2397fad60
Fix #8092
2018-03-10 23:49:43 +01:00
Inovea Conseil
5e46813323
Add phone research
2018-03-09 23:45:28 +01:00
Maxime Kohlhaas
ded69bf57d
New : link users to company like a tag
2018-03-09 18:59:06 +01:00
Laurent Destailleur
9f42e1b172
Prepare code to introduce different payment modes than BAN
2018-03-08 22:33:40 +01:00
Laurent Destailleur
489dde4db4
Prepare database to store payment modes of customers
2018-03-08 22:26:42 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
ptibogxiv
7774b49beb
Fix paymentmodes.php
2018-03-08 10:03:36 +01:00
ptibogxiv
5c04c2886c
Delete because replace by paymentmodes.php
2018-03-08 02:09:27 +01:00
ptibogxiv
c3e211f3f7
Delete gateway.php
2018-03-08 02:08:43 +01:00
ptibogxiv
197ce2fc3d
Fix set default
2018-03-08 02:08:14 +01:00
ptibogxiv
d791b014a5
update comment and class
2018-03-07 16:17:25 +01:00
Laurent Destailleur
b2f6105ae2
FIX #8277
2018-03-07 15:52:58 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop
2018-03-07 13:19:25 +01:00
ptibogxiv
5e0327329c
NEW convert rib.php to gateways.php
...
do stripe integration
be conform to PSD2 rules
less tab fo company
2018-03-06 13:23:35 +01:00
Laurent Destailleur
2f9f4d0675
WIP Create payment of member subscription with paypal
2018-03-05 21:46:24 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
6338328c90
Fix scrutinizer errors
2018-03-04 11:09:53 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Rui Strecht
97f7de9d3a
Fixed GB check url
2018-02-28 14:36:49 +00:00
Rui Strecht
9eb9228268
Added idprof url for country PT
2018-02-28 12:51:29 +00:00
Rui Strecht
5ef00d200f
Added idprof1 check to country PT
2018-02-28 12:26:05 +00:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
7dfedbf35c
Merge pull request #8228 from hregis/7.0_bug
...
FIX Use of undefined constant _ROWS_2
2018-02-25 12:55:17 +01:00
Laurent Destailleur
4581d6049c
Update societecontact.php
2018-02-25 12:52:39 +01:00
Regis Houssin
5ecbe2ae81
Fix: Use of undefined constant _ROWS_2
2018-02-24 13:49:30 +01:00
Regis Houssin
4c06384197
Fix: differentiate sharing of "member" and "member_type"
2018-02-24 11:13:14 +01:00
Laurent Destailleur
d8bf553ea9
Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing
2018-02-23 19:55:15 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
Laurent Destailleur
863cab362f
NEW Cat set the encryption algorithm for extrafields of type password
2018-02-23 14:38:41 +01:00
Laurent Destailleur
829de06bf6
Fix error management
2018-02-23 11:23:04 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
Laurent Destailleur
276f2dce77
FIX #8200
2018-02-20 14:55:23 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Marc de Lima Lucio
daca27b2ed
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
2018-02-14 18:02:40 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Laurent Destailleur
b2835fc803
Fix check of vat only for european countries
2018-02-12 15:54:24 +01:00
Laurent Destailleur
6bdb82cf27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/api_thirdparties.class.php
2018-02-12 04:15:47 +01:00
Laurent Destailleur
55779e3b55
Fix confusion between supplier and customer categories
2018-02-12 04:07:45 +01:00
Laurent Destailleur
aaf4db2e03
Fix API on thirdparty categories
2018-02-12 04:05:51 +01:00
Ysandor
b48d369258
add the possibility to remove a category from a thirdparty
...
I don't know if there is a good reason for not proposing to unlink a thirdparty from a category but if it is not the case here is a piece of code allowing to remove a category that works for me and seems general enough to be useful to other people.
The new function is inspired from the addCategory function.
PS : This is the first time i'm trying to contribute on github so don't hesitate to tell me if I did something wrong.
2018-02-10 20:38:53 +01:00
Laurent Destailleur
26ee7ec5be
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2018-02-08 17:27:36 +01:00
Laurent Destailleur
d10d9f0fb2
Fix scrutinizer
2018-02-08 17:22:07 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
2b2e68c78d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/societe/card.php
2018-02-08 15:18:28 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
3f17c92aa3
Update card.php
2018-02-08 13:09:21 +01:00
Rui Strecht
8c732a1443
Trying to not include sql request into method setMysoc
2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/core/class/commonobject.class.php
2018-02-06 10:26:38 +00:00
atm-quentin
2081aefc84
FIX creer into lire
2018-02-05 16:07:08 +01:00
atm-quentin
ae9c7ad6b6
FIX unset categorie
2018-02-05 10:40:52 +01:00
Laurent Destailleur
fe57cf697f
Fix init category selected
2018-02-04 14:35:38 +01:00
Laurent Destailleur
ec15048964
Fix init category selected
2018-02-04 14:34:31 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
f57ea2682a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/notify.class.php
htdocs/societe/class/societe.class.php
2018-02-03 19:33:24 +01:00
Regis Houssin
13106d34a6
Fix: compatibility with multicompany sharing
2018-02-02 12:36:47 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
f6f57aa938
Missing Api for standing proposal/orders/invoices
2018-02-01 02:29:41 +01:00
Laurent Destailleur
8896e0573f
Fix missing name alias
2018-02-01 01:10:54 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
14ecdce650
Fix merge of thirdparties (pb when merging codes and error management)
2018-01-31 18:01:56 +01:00
Laurent Destailleur
e46e66b1ed
NEW Introduce option THIRDPARTY_QUICKSEARCH_ON_FIELDS to personalize
...
search fields for quick search
2018-01-31 14:34:48 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2018-01-31 11:19:39 +00:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
98c7ac9362
Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE
...
NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete
2018-01-29 21:08:18 +01:00
Laurent Destailleur
f2a3c83053
Better error messages
2018-01-27 18:46:52 +01:00
Rui Strecht
4483265d5e
Forgot to update societe card.php with the same changes
2018-01-25 18:30:20 +00:00
Maxime Kohlhaas
53e6da8c7c
Missing fetch and translation
2018-01-20 21:57:36 +01:00
Maxime Kohlhaas
6f248a6590
New allow to define order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
81999be027
Fix lose filter type
2018-01-17 17:29:17 +01:00
Laurent Destailleur
756838c3a0
Fix lose filter type
2018-01-17 17:13:50 +01:00
Laurent Destailleur
26ba0a9ec2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
Laurent Destailleur
4c8af0ff50
Fix name alias on list
2018-01-15 12:24:56 +01:00
Laurent Destailleur
3b9aee7d4c
Update list.php
2018-01-15 12:22:21 +01:00
Laurent Destailleur
c29bfcef31
Merge pull request #8053 from Oeris/develop-api
...
FIX use DB PREFIX instead of llx_
2018-01-15 11:33:09 +01:00
Laurent Destailleur
68f0808d16
Update societe.class.php
2018-01-15 11:30:32 +01:00
Neil Orley
8d710020e9
FIX use DB PREFIX instead of llx_
2018-01-11 12:58:41 +01:00
Regis Houssin
157e118cba
Fix: broken feature
2018-01-11 10:47:40 +01:00
Laurent Destailleur
95312d1944
Fix regression
2018-01-11 10:20:49 +01:00
Laurent Destailleur
a4ab37e990
Remove deprecated field
2018-01-11 01:16:14 +01:00
Laurent Destailleur
4316793638
Merge pull request #8047 from hregis/develop_multicompany
...
Fix: some bugs with multicompany sharing
2018-01-11 01:07:17 +01:00
Laurent Destailleur
a11cb8dcbf
Update card.php
2018-01-11 01:06:50 +01:00
Laurent Destailleur
e41f761157
Fix ident
2018-01-11 00:47:29 +01:00
Laurent Destailleur
f2b8c3c97d
Fix check of customer/supplier code
2018-01-10 18:19:54 +01:00
Regis Houssin
8c3b4f62db
Fix: wrong entity with thirdparty sharing
2018-01-10 13:30:57 +01:00
Regis Houssin
4cc0e889c1
Fix: restore broken feature
2018-01-10 12:38:27 +01:00
Laurent Destailleur
cda078ce26
Fix test on email unique
2018-01-10 12:27:11 +01:00
Laurent Destailleur
ebc76b5f27
Fix tooltips on thirdparty and invoice
2018-01-04 18:29:12 +01:00
Juanjo Menent
b650ba21c4
Merge remote-tracking branch 'upstream/6.0' into 6.0
2017-12-26 10:52:46 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Juanjo Menent
dc930dd6c5
FIX: Bad name alias showing in name of third column
2017-12-20 16:46:49 +01:00
Laurent Destailleur
016be9139b
Fix sql request
2017-12-19 17:09:47 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
4017d09613
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-10 21:28:36 +01:00
Laurent Destailleur
1d9d8980a9
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-12-10 21:16:49 +01:00
Laurent Destailleur
e4725f4248
FIX #7933
2017-12-10 20:55:51 +01:00
Laurent Destailleur
472d7b591e
Fix hook for formmail and translation
2017-12-10 02:01:36 +01:00
Laurent Destailleur
f22e7ee24a
Fixes
2017-12-09 17:29:19 +01:00
Maxime Kohlhaas
50203cdf01
Fix : link to create action is not a button but a top list link
2017-12-06 23:44:34 +01:00
Laurent Destailleur
78c4b7f912
Fix look and feel v7
2017-12-04 20:17:07 +01:00
Laurent Destailleur
46b281f703
Fix for #7697
2017-12-01 19:29:29 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
9508c3e0b9
Fix trigger was not called
2017-11-29 16:34:44 +01:00
Laurent Destailleur
4245ad6e2a
Return error messages
2017-11-29 16:26:19 +01:00
Laurent Destailleur
2693e5db6d
Fix the trigger COMPANY_MODIFY provide information of thirdparty merged
2017-11-29 16:24:58 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
a0406bc741
Standardize view of events for products
2017-11-26 20:24:20 +01:00
Laurent Destailleur
3d48e509bd
Clean code
2017-11-25 19:16:15 +01:00
Laurent Destailleur
4c8b8dcba5
Fix sort order
2017-11-25 16:53:37 +01:00
Laurent Destailleur
9b8011f75b
Fix class not found
2017-11-25 16:52:04 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
38ef5890dc
Replace deprecated dol_print_graph with DolGraph
2017-11-23 18:47:24 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:29:42 +01:00
Laurent Destailleur
c527189088
Standardize page name
2017-11-16 12:18:25 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
cb03b2f307
NEW Can sort joined files on thirdparty and user card.
2017-11-10 18:14:29 +01:00
Laurent Destailleur
11cc82e6d2
Update doc
2017-11-10 10:15:50 +01:00
Laurent Destailleur
aa7e9e156a
Merge pull request #7762 from atm-maxime/new_socmerge_cat
...
NEW merge categories while merging thirdparties
2017-11-05 18:30:53 +01:00
Laurent Destailleur
a72703d316
Fix deprecated code
2017-11-03 17:29:25 +01:00
Laurent Destailleur
c479efa480
Fix encoding with select2
2017-11-03 16:29:23 +01:00
Laurent Destailleur
a346a1a5e9
Work on website module
2017-11-03 15:56:16 +01:00
Maxime Kohlhaas
73d3cc7ce3
New : merge categories while merging thirdparties
2017-11-03 15:23:18 +01:00
Laurent Destailleur
4381c35835
Standardize code
2017-11-03 11:42:40 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Laurent Destailleur
b29f32171c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
cd5e43483e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
4feecbeab8
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-10-28 22:03:06 +02:00
Laurent Destailleur
adc4db0f85
Standardize code
2017-10-28 16:55:25 +02:00
Ferran Marcet
bc8127d685
Fix: paid supplier invoices are shown as abandoned on the consumption card.
2017-10-27 11:52:05 +02:00
Laurent Destailleur
e4645cf2c5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/blockedlog/class/blockedlog.class.php
htdocs/contrat/card.php
htdocs/societe/card.php
2017-10-27 02:12:35 +02:00
Laurent Destailleur
82231b77a2
Fix data for supplier must be not visible if supplier module off
2017-10-27 01:46:54 +02:00
Laurent Destailleur
ee1996ad37
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2017-10-27 01:16:51 +02:00
Laurent Destailleur
6a9837528e
Merge pull request #7703 from Oeris/develop-api
...
FIX Data related to customer moved to thirparties api
2017-10-27 00:42:10 +02:00
Laurent Destailleur
a741a6bb3e
Update api_thirdparties.class.php
2017-10-27 00:41:56 +02:00
Laurent Destailleur
e865f41b86
NEW Extrafields "link to object" now use a combo selection and getNomUrl
2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1
Work on modulebuilder and website module
2017-10-26 01:02:13 +02:00
Laurent Destailleur
ff9a6ca01b
Work on module builder
2017-10-25 22:23:54 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Neil Orley
3e53a2ecff
FIX merging conflict
2017-10-25 14:52:33 +02:00
Neil Orley
ff760eb8d5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-10-25 14:46:44 +02:00
Neil Orley
0f98572c2b
FIX Filter didn't work for credit note
...
Modify the SQL request to be able to filter on credit note
2017-10-25 14:04:36 +02:00
Neil Orley
cb71e921fd
NEW Get credit notes or deposits of a thirdparty
...
Ability to filter : available or applied
Returns a list of credit notes or deposits
2017-10-25 11:39:23 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
d2f723045c
Work on website and modulebuilder
2017-10-24 17:30:05 +02:00
Neil Orley
327f31611c
FIX Data related to customer moved to thirparties api
...
Related to commit : b6825703b4
2017-10-24 14:21:22 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
98674f6d82
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/societe/class/api_contacts.class.php
htdocs/societe/class/api_thirdparties.class.php
2017-10-22 15:01:35 +02:00
Laurent Destailleur
79279caa2e
FIX #7619
2017-10-22 14:56:00 +02:00
Laurent Destailleur
745c4625a6
FIX #7619
2017-10-22 14:48:42 +02:00
Laurent Destailleur
fb13419de8
Merge pull request #7665 from dolibarr95/patch-26
...
Fix: missing logo in SQL and $companystatic
2017-10-22 02:43:19 +02:00
Laurent Destailleur
1426737a26
Work on website
2017-10-21 12:26:14 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Laurent Destailleur
0e397b3e81
Work on website module
2017-10-20 18:44:03 +02:00
Laurent Destailleur
ab4f5a3aea
Clean code
2017-10-20 18:15:43 +02:00
dolibarr95
03eb69172e
logo
...
Add logo in sql and in $companystatic in order to load the picture in getNomUrl.
2017-10-20 09:17:18 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
69b131b919
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/societe/class/api_thirdparties.class.php
2017-10-18 11:28:20 +02:00
Laurent Destailleur
235817c581
Fix missing default limit
2017-10-17 12:02:58 +02:00
Laurent Destailleur
8b78b12926
Merge pull request #7642 from BackrndSource/patch-1
...
Fix #7641 Fix update of note_public and note_private on societe class
2017-10-16 21:39:24 +02:00
BackrndSource
fdcab4c6e1
Update societe.class.php
...
fix error for function update()
Now it updates the note_public and note_private.
2017-10-16 17:16:44 +02:00
Rui Strecht
447cc208fe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/societe/class/societe.class.php
2017-10-16 09:34:24 +01:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
86f7add355
FIX Default value was not set
2017-10-12 19:12:52 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
7c29bb5818
Fix must use differently FRST and SEPA
2017-10-12 01:24:19 +02:00
Laurent Destailleur
15bcbc8b43
FIX Check on bank info for sepa must be done on iban/swift not on ban
2017-10-12 00:38:59 +02:00
Laurent Destailleur
8674867db2
Fix creation/edit rum number
2017-10-11 23:43:42 +02:00
Laurent Destailleur
918738ce46
Set creation date
2017-10-11 23:06:49 +02:00
Regis Houssin
f2d9288db5
NEW add company alias name when create company from member
2017-10-09 12:38:44 +02:00
Rui Strecht
1a5cdf2406
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/admin/company.php
# htdocs/core/class/commonobject.class.php
2017-10-09 11:36:38 +01:00
Laurent Destailleur
3e0ccd6312
FIX #7585
2017-10-09 10:43:19 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Regis Houssin
45de1ca21e
Fix: check security
2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b
Fix: refactorization of "getListForItem" function
2017-10-03 19:01:54 +02:00
Regis Houssin
f8f4ff6d21
Fix: missing include api_categories class
2017-10-03 13:07:07 +02:00
Laurent Destailleur
3ddd5d3d3a
The default value feature is sensitive to url parameters.
2017-10-01 14:54:17 +02:00
Laurent Destailleur
2c1f1ec651
Try to fix autocomplete
2017-09-30 20:31:20 +02:00
Laurent Destailleur
47c0231fb8
Fix error management
2017-09-30 19:12:12 +02:00
Laurent Destailleur
9ba8b9bf7e
Fix stay on create form if creation fails
2017-09-30 18:19:20 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Rui Strecht
4839d0f84d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-28 09:36:52 +01:00
Laurent Destailleur
e878f3cfd5
No more need of contacts on each tab by default
2017-09-27 20:15:56 +02:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
53997c5d8c
Merge pull request #7488 from AurelienC/patch-1
...
FIX Solve bug with alias name shown on wrong thirdparty in list
2017-09-26 19:35:24 +02:00
Rui Strecht
3ebb18ab16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-26 16:34:59 +01:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
Laurent Destailleur
76f1dbe16b
FIX #7288
2017-09-26 12:25:26 +02:00
Aurélien
a350a06755
Solve bug with alias name display
...
The bug display the alias name on the following name between brackets after name column.
2017-09-25 21:15:35 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Rui Strecht
24f8ea003a
Added self to contributors list
2017-09-20 12:30:59 +01:00
Rui Strecht
42a57aab26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-20 12:16:09 +01:00
Rui Strecht
f1126b65bf
Updated method to fetch state name, code and id to match method used with country
...
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
2017-09-20 12:06:35 +01:00
Laurent Destailleur
1e33495f42
Fix remove warnings
2017-09-19 00:31:51 +02:00
Laurent Destailleur
291a0d46e6
Fix edit of categories
2017-09-18 01:39:39 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
961d475a9d
More complete substitution system.
...
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
2017-09-16 03:45:29 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
2390d20232
Update travis
2017-09-14 09:56:02 +02:00
Laurent Destailleur
d225cce446
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 08:23:42 +02:00
Laurent Destailleur
d7b84bd35f
Fix responsive
2017-09-13 22:56:24 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
fcf82f1163
Enhancement into setup of member module
2017-09-12 11:17:23 +02:00
Laurent Destailleur
78ffbd1095
Merge pull request #7369 from hregis/develop_bug
...
Fix: remove table prefix
2017-09-11 15:06:01 +02:00
Regis Houssin
092b87bbda
Fix: add llx_actioncomm in $childtablesoncascade
2017-09-11 13:36:03 +02:00
Laurent Destailleur
7d42a58230
Fix no more fk_soc in this table
2017-09-11 12:46:01 +02:00
Regis Houssin
f8938f308d
Fix: remove table prefix
2017-09-11 08:17:25 +02:00
Laurent Destailleur
cf56da8102
NEW Default filter and sort order can use partial list of query
...
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
c315ad7801
Fix missing tables into childtables
2017-09-10 18:04:13 +02:00
Laurent Destailleur
2db71cb773
Fix missing tables into childtables
2017-09-10 18:01:20 +02:00
Regis Houssin
310e912a9d
Fix: missing parameters for filter and sort
2017-09-08 19:57:59 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Laurent Destailleur
14f41493bb
NEW Show country and vat number into company tooltip
2017-09-03 20:49:36 +02:00
Laurent Destailleur
ead7810ee7
Add VAT number into thirdparty list
2017-09-03 17:50:38 +02:00
Laurent Destailleur
75b8462c03
Fix error output
2017-09-03 17:47:45 +02:00
Laurent Destailleur
084ea049d8
Minor bugs
2017-09-03 16:07:21 +02:00
Laurent Destailleur
ec0d277123
Code comment
2017-09-03 00:46:28 +02:00
Laurent Destailleur
75e639db6c
Fix error management
2017-09-02 15:23:53 +02:00
Laurent Destailleur
7f7b4cddb4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-02 12:37:02 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Laurent Destailleur
4644a39be5
Merge pull request #7322 from ruistrecht-alt/NEW_Add_Region_to_third_party_societe_list
...
NEW Added regions to third party/societe lists, can be filtered
2017-09-02 00:13:20 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
0d0b7f8af2
Fix email
2017-09-01 17:18:07 +02:00
Rui Strecht
cd8362498f
NEW Added regions to third party/societe lists, can be filtered
2017-09-01 16:07:07 +01:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
fbac1cfe1e
Fix lang loading
2017-08-24 15:00:53 +02:00
Laurent Destailleur
4337001418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/list.php
2017-08-24 14:26:45 +02:00
Laurent Destailleur
2416c387f5
Fix trad
2017-08-24 13:35:52 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Laurent Destailleur
bf1f60b31e
Merge
2017-08-23 17:14:29 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
1b1d1a8d0b
FIX #7156
2017-08-23 16:57:07 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a
Fix: missing scandir
2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670
Fix: "scandir" in url is blocked in some providers
2017-08-23 10:07:00 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
5c0d4e10cf
Can add technical id or import_key
2017-07-27 01:47:27 +02:00
Laurent Destailleur
7e0a165131
Fix some pb in search using phone
2017-07-26 20:33:25 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Laurent Destailleur
27682d9ef3
Update rib.php
2017-07-21 14:52:54 +02:00
cam.lafit
69aed8ac7f
Allow RUM on creation step
...
* close #4932
2017-07-19 16:27:34 +02:00
Laurent Destailleur
4ee70e496e
Merge pull request #7143 from hregis/6.0_bug
...
Fix: missing entity filter (multicompany)
2017-07-13 14:33:45 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Regis Houssin
9430952561
Fix: missing entity filter (multicompany)
2017-07-12 11:00:18 +02:00
Laurent Destailleur
90dcd3d30d
Look and feel v6
2017-07-11 13:26:11 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
Laurent Destailleur
451e8fc024
FIX Support of vat code when using price per customer
2017-07-04 17:37:28 +02:00
Laurent Destailleur
a5cfd7c2e2
FIX Error when updating thirdparty not returned
2017-07-01 16:24:33 +02:00
Laurent Destailleur
7ae52d843c
Look and feel v6
2017-07-01 14:23:24 +02:00
Laurent Destailleur
e8b33e3dba
To provide solution to get thirdparty when name is not unique.
...
Conflicts:
htdocs/societe/class/societe.class.php
2017-06-29 15:38:39 +02:00
Laurent Destailleur
2f8c0bb555
Revert "To provide solution to get thirdparty when name is not unique."
...
This reverts commit 58328d36b3
2017-06-29 15:36:39 +02:00
Laurent Destailleur
58328d36b3
To provide solution to get thirdparty when name is not unique.
2017-06-29 15:32:36 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
63dcdc3a03
Fix API was loading definition of all APIs at each call.
2017-06-25 17:09:08 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae
Fixing pages warning when value is null
2017-06-24 16:45:45 +02:00
Laurent Destailleur
ba82bc39c8
Fix missing alias
2017-06-24 00:25:29 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
c656856ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-06-16 10:52:43 +02:00
Laurent Destailleur
b1945daf6c
Fix alignement
2017-06-16 01:07:44 +02:00
Laurent Destailleur
07b676792a
Fix do not show localtax info if not used.
2017-06-16 01:02:53 +02:00
Regis Houssin
9410466d72
Fix: better check and security
2017-06-15 21:51:31 +02:00
Laurent Destailleur
4009b1837c
Fix permissions
2017-06-15 11:17:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Laurent Destailleur
3e51d2f537
Fix backto link after creating a third party
2017-06-08 11:51:31 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Laurent Destailleur
cfe9d02bc3
Merge pull request #6952 from atm-ph/fix_search_extrafield_on_list
...
Fix can't use search on all extrafields on list
2017-06-08 10:18:55 +02:00
Regis Houssin
b183c6e7ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
phf
707a9e40c0
Fix can't use search on all extrafields on list
2017-06-06 12:01:49 +02:00
Regis Houssin
03df365eea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 11:01:42 +02:00
Laurent Destailleur
eb45333685
Merge pull request #6946 from grandoc/develop
...
FIX : bug #6943
2017-06-06 10:55:18 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
philippe grand
a0b4f8b004
FIX : bug #6943
2017-06-04 12:09:54 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
160eb194ea
Clean REST response for user and third parties
2017-05-24 15:24:35 +02:00
Laurent Destailleur
2da50f1eca
Look and feel v6
2017-05-23 01:32:19 +02:00
Laurent Destailleur
0cd030d856
NEW Introduce mass actions on contacts
2017-05-23 00:13:07 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
6e31de731b
Fix phpunit
2017-05-21 20:24:56 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
807c77f754
Fix inconsistent options
2017-05-19 18:03:49 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
fbb3406c5d
Fix missing filters
2017-05-18 10:46:55 +02:00
Laurent Destailleur
b29f325fcf
Work on search criteria persistence
2017-05-16 23:38:23 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
71833f5987
Standardize code
2017-05-13 17:04:46 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
5a96ae54b9
FIX Link to files on bank account tab broken with multicompany
...
FIX Link to preview on thirdparty broken with multicompany
2017-05-10 19:08:07 +02:00
Laurent Destailleur
e48ba06730
Fix generation of sepa mandate with multicompany
2017-05-10 18:13:38 +02:00
Laurent Destailleur
5a31d2c95a
Fix css
2017-05-10 13:39:00 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
Alexandre SPANGARO
04e119d7a6
New : Add search of accountancy code in main thirdparty search
2017-04-18 07:03:57 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Laurent Destailleur
9447b2a38b
Merge pull request #6658 from dolibarr95/patch-10
...
Fix typo
2017-04-11 11:07:24 +02:00
Laurent Destailleur
759315aef5
NEW Mass action delete available on project and tasks
2017-04-11 02:48:16 +02:00
Marcos García de La Fuente
2d83efc7e3
FIX #6673 Missing "nature" table header in thirdparty list
...
Close #6673
2017-04-09 15:03:02 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
dolibarr95
8154521a22
Fix typo
...
Fix typo error in trigger name.
2017-04-07 14:15:36 +02:00
Laurent Destailleur
12375be14a
Merge pull request #6593 from dolibarr95/patch-5
...
NEW : Create a trigger for company rib update
2017-04-06 23:29:06 +02:00
Laurent Destailleur
e8767122b0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/societe/list.php
2017-04-03 11:05:19 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
13587fa13e
Fix key were not translated
2017-04-03 10:51:35 +02:00
Laurent Destailleur
4902df7e3f
Work on look and feel v6
2017-04-02 19:28:38 +02:00
Laurent Destailleur
17a1874e36
FIX Counter of notification of a thirdparty
2017-04-01 13:43:05 +02:00
Laurent Destailleur
536afb44c7
Merge pull request #6599 from defrance/patch-2
...
NEW : SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl
2017-03-31 17:44:31 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
dolibarr95
6bd112db5e
Unify the trigger name
...
Should be COMPANY_RIB_MODIFY instead of COMPANY_RIB_UPDATE
2017-03-30 14:49:40 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
dolibarr95
80715ec61b
Return -1 instead of 0 if error
2017-03-28 14:50:01 +02:00
Laurent Destailleur
41063e7cf2
Fix: trigger for delete must be before delete of element
2017-03-28 12:55:20 +02:00
BENKE Charlie
6ee1c79f6f
SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl
...
0 = only socname (usual)
1 = socname and code_customer and supplier (like before)
2 = only code customer
3 = only code supplier
2017-03-27 18:26:24 +02:00
dolibarr95
17e5279907
Create a trigger for company rib delete
2017-03-27 14:00:05 +02:00
dolibarr95
262d1d5f8c
Create a trigger for company rib create
2017-03-27 09:19:46 +02:00
Laurent Destailleur
f843f8a93d
Start to move search bar before table titles
2017-03-27 00:48:50 +02:00
Laurent Destailleur
e38ad37ce3
FIX #6517 #6525 Autocompletion of thirdparty after n chars not
...
implemented
2017-03-26 05:02:06 +02:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
Laurent Destailleur
e72f0076ed
Remove border-bottom useless
2017-03-23 13:06:38 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
7662ddc2fc
Merge pull request #6529 from dolibarr95/patch-4
...
NEW : Create a trigger for company create RIB
2017-03-18 03:18:31 +01:00
Laurent Destailleur
dfc1ed7d72
FIX #6535
2017-03-16 22:49:02 +01:00
Laurent Destailleur
deb91ad7c1
FIX Data lost during merge of thirdparties
2017-03-15 13:30:30 +01:00
Laurent Destailleur
888675016d
NEW Can use dol_fiche_end without showing bottom border.
2017-03-15 11:13:30 +01:00
dolibarr95
0721e6af42
add condition
...
add condition check for $notrigger
2017-03-15 10:37:08 +01:00
dolibarr95
688073dc18
Create a trigger for company create RIB
...
Since there no 'trigger' executed when we create a RIB for a company (COMPANY_CREATE, COMPANY_MODIFY, COMPANY_DELETE not executed), I purpose a new one COMPANY_RIB_CREATE. If this PR is qualified i will purpose COMPANY_RIB_MODIFY and COMPANY_RIB_DELETE too.
tks
2017-03-15 10:31:45 +01:00
Josep Lluís
14ed67499e
FIX html tag
...
Fix incorrect html tag not closed
2017-03-14 00:26:47 +01:00
Laurent Destailleur
3affcd7f52
FIX colspan
2017-03-13 02:12:24 +01:00
Laurent Destailleur
b8b32ae2e3
FIX colspan
2017-03-13 02:10:22 +01:00
Laurent Destailleur
4ca634b41c
Better look and feel
2017-03-11 12:04:28 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
8ad9a9c9c8
doxygen
2017-03-03 15:15:21 +01:00
Laurent Destailleur
5c2ed0f19f
Fix field title lost
2017-02-28 12:57:34 +01:00
Laurent Destailleur
bc41b6dfe2
Merge pull request #6459 from defrance/patch-84
...
Add selectform for frst recur option (better usage)
2017-02-24 15:28:16 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
BENKE Charlie
55070ab907
Add selectform for frst recur option (better usage)
2017-02-22 16:51:30 +01:00
Laurent Destailleur
24c2675705
Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email
...
NEW : Can send email to multiple destinaries from mail form
2017-02-22 14:39:35 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
florian HENRY
4836fa8f76
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email
2017-02-17 13:24:06 +01:00
BENKE Charlie
90770a1f23
Accounting code not display on tooltip
2017-02-17 10:47:29 +01:00
florian HENRY
5ec01b3175
NEW : Can send email to multiple destinaries from mailform
2017-02-15 11:41:09 +01:00
Gustavo Novaro
febe95cd2e
$db attributte now be protected
2017-02-08 20:27:14 -03:00
Gustavo Novaro
e053308c6f
Code style
...
var to public
2017-02-08 17:24:11 -03:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 10:57:02 +01:00
Laurent Destailleur
d7060b0c4b
FIX #6360
2017-02-02 03:14:21 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
fbbf8cd8a4
Fix bad side effect of uniformizing a constant name.
2017-02-01 15:47:08 +01:00
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
Laurent Destailleur
fd90bf466b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
1e78c4c418
FIX Change the customer code only if error on duplicate
2017-01-28 14:54:06 +01:00
Laurent Destailleur
27caa586c2
Fix auto increment customer code must be done only if error is on
...
duplicate code
2017-01-28 12:36:53 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-27 01:24:55 +01:00
Laurent Destailleur
1239e8600a
Merge pull request #6326 from altatof/fix_entity_thirdpart_files
...
Fix entity thirdparty files links
2017-01-27 00:30:03 +01:00
altatof
09dde659d5
FIX: add entity param to document link
2017-01-25 09:26:26 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Regis Houssin
e2e4403869
Fix: avoid numeric errors
2017-01-23 12:20:44 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
3a2d9c8610
Fix for rtl languages
2017-01-21 16:12:25 +01:00
Laurent Destailleur
94249b7926
NEW Add statistics on tabs
2017-01-20 14:03:07 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Ferran Marcet
caba4836b3
Fix: Show correct bank account order
2017-01-17 10:13:13 +01:00
Ferran Marcet
819dc44533
Fix: Show correct bank account order
2017-01-17 10:01:59 +01:00
Laurent Destailleur
c1d6ad90b3
FIX #6255
2017-01-16 12:35:19 +01:00
Laurent Destailleur
a05132d26e
Fix PHP 7.1 error
2017-01-16 09:05:09 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Laurent Destailleur
8d5c853267
FIX Protection so even if link is output for external user, links is
...
disabled.
2017-01-12 15:12:53 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
e802ff3385
Fix POO declaration
2017-01-12 10:57:15 +01:00
Laurent Destailleur
dba777c57b
Fix missing field alias
2017-01-08 12:10:07 +01:00
Laurent Destailleur
1856b5cfb8
Fix filter on status for third parties
2017-01-08 11:50:43 +01:00
KiteAtao
3bb1756a13
Fix Contact Api for REST WebServices
2017-01-07 21:37:45 +01:00
aspangaro
ab8341cc8b
Presentation
2016-12-23 06:33:58 +01:00
Laurent Destailleur
da1d4d80f2
Fix return code REST similar for all api with POST
2016-12-23 02:09:26 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Laurent Destailleur
1fdbcf4c0f
Fix missing page to match new reorg of agenda events (done for
...
thirdparty but not complete for contact)
2016-12-19 16:22:41 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Laurent Destailleur
24914e8e4f
Fix css and missing warning
2016-12-12 13:18:32 +01:00
Maxime Kohlhaas
b5712d1f1c
Missing lang load
2016-12-11 13:44:47 +01:00
Maxime Kohlhaas
f800e38099
Wrong fields in soc list
2016-12-11 13:39:44 +01:00
Laurent Destailleur
5120093872
FIX balance of TR
2016-12-10 22:58:55 +01:00
Jean-Pierre Morfin
4b4dc8fe0d
FIX Calling soc.php with an unknown socid display a message
...
Fix #4632
Calling soc.php with an unknown socid display a simple error message
2016-12-10 11:49:16 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
Laurent Destailleur
5e012bcc13
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-11-28 16:40:57 +01:00
Laurent Destailleur
196428edf5
FIX #6051
2016-11-28 16:34:38 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
5ebb86c45a
FIX #6022
2016-11-22 20:24:42 +01:00
Laurent Destailleur
ff4fa9977c
FIX #5895
2016-11-20 15:47:05 +01:00
Laurent Destailleur
a17345da12
Fix list of fields must be same in loop and title line. Title must come
...
from declaration array.
2016-11-19 20:07:35 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
3ae4ecfb99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/rib.php
2016-11-06 14:47:05 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
7fa9692458
Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE.
2016-11-02 12:48:50 +01:00
Laurent Destailleur
ef03f59e50
Uniformize code
2016-11-02 12:16:46 +01:00
Laurent Destailleur
73b5bad2da
Fix missing hook init
2016-11-01 20:53:05 +01:00
Laurent Destailleur
6f061fc366
Fix css
2016-10-31 21:53:39 +01:00
Laurent Destailleur
3fbba59f69
Better management of status of events
2016-10-30 13:12:35 +01:00
Laurent Destailleur
aec0e79653
Normalize constant name.
2016-10-29 21:47:10 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
florian HENRY
c37cc5b6d1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures
2016-10-26 10:44:15 +02:00
Laurent Destailleur
43bf372cf7
Fix doxygen
2016-10-25 21:15:25 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
florian HENRY
237d04e3c0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures
2016-10-25 09:44:03 +02:00
Laurent Destailleur
0ae5a3799c
Fix html
2016-10-24 12:42:37 +02:00
Laurent Destailleur
3b05d00163
Better responsive design
2016-10-24 12:06:33 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27:39 +02:00
florian HENRY
201e084186
style
2016-10-24 09:07:21 +02:00
florian HENRY
5dcf3033ec
Merge branch 'develop' into dev_consomption_thirdparty_withmorefigures
2016-10-24 08:53:51 +02:00
florian HENRY
4c4e404dae
Add unit PRice
2016-10-24 08:53:39 +02:00
Laurent Destailleur
b284bdd953
NEW #5896 More complete data on event sent by email (name in title,
...
emails list in details)
2016-10-24 02:02:30 +02:00
Laurent Destailleur
f93bca9be9
NEW Can see/make bank conciliation from transaction list
2016-10-21 17:00:31 +02:00
florian HENRY
95a5152746
NEW : Consumption view on thirdparty total line and total HT by element
2016-10-21 15:38:52 +02:00
Laurent Destailleur
c4dd689b08
Clean unreachable code
2016-10-21 11:53:41 +02:00
Laurent Destailleur
c1bf7c52f4
Add a line of filter in list of events related to thirdparty or projects
2016-10-18 00:02:18 +02:00
Laurent Destailleur
434b3ef643
Uniformize code and look and feel
2016-10-17 17:52:58 +02:00
Laurent Destailleur
28933c31dd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
2016-10-16 19:04:33 +02:00
Laurent Destailleur
2db38b4bcc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/societe/list.php
2016-10-16 19:02:36 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
5e00fb8fc7
Fix sepa mandate translation
2016-10-14 17:56:22 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Laurent Destailleur
720bb76a8f
Fix selection of model was not done on company bank accounts page
2016-10-10 01:18:08 +02:00
Laurent Destailleur
e11d9d7e4c
Reduce translation keys
2016-10-10 00:31:26 +02:00
Laurent Destailleur
bae1e69da3
NEW Can edit RUM number
2016-10-10 00:24:05 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
florian HENRY
ee20704a8a
FIX : missing column into SQL on thridparty list
2016-10-05 17:20:56 +02:00
Laurent Destailleur
6ac39b97e4
Fix restore list of attached files into action report
2016-10-03 00:38:28 +02:00
Laurent Destailleur
f92ca518f7
Uniformize look and feel
2016-10-02 16:38:58 +02:00
Laurent Destailleur
3efa0e411d
NEW Add a direct debit mandate PDF template.
2016-10-02 15:29:43 +02:00
Laurent Destailleur
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +02:00
Laurent Destailleur
c9792ff047
Fix translation
2016-10-01 20:12:00 +02:00
Laurent Destailleur
29634304fd
Merge pull request #5795 from atm-ph/fix_4.0_value_too_long
...
Fix fields too long for database
2016-09-28 17:58:57 +02:00
phf
058cf61ae0
Fix fields too long for database
2016-09-27 10:06:22 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
aspangaro
2dbeeedd14
Move tab menu for subscription in member.lib
...
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
Laurent Destailleur
39c4feaef7
Enhancement for usage on smartphone
2016-09-21 03:54:54 +02:00
Laurent Destailleur
b5dad8cfbf
Better responsive
2016-09-21 00:29:19 +02:00
Laurent Destailleur
c4c7ccc226
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/societe/note.php
htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
7ac1b712e0
Start to work on sepa mandate generation
2016-09-19 00:39:46 +02:00
Laurent Destailleur
95f2cae825
Start to work on sepa mandate generation
2016-09-19 00:26:30 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
46ce1d3a69
Uniformize code
2016-09-18 16:11:30 +02:00
Laurent Destailleur
537c6b0cc7
Uniformize code
2016-09-18 15:57:53 +02:00
Laurent Destailleur
d1c4f02bf7
Uniformize code and style
2016-09-18 14:41:17 +02:00
Laurent Destailleur
a4c3a4588d
FIX link "back to list" was not visible.
2016-09-18 14:12:49 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
e90909051e
Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab
...
NEW filter on action type on thirdparty event tab
2016-09-11 13:34:08 +02:00
Laurent Destailleur
25c5f40bf1
Add css on picto status
2016-09-10 19:44:55 +02:00
Laurent Destailleur
0079a3a9c5
A better explanation on choice on thirdparty creation process
2016-09-09 18:41:42 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Alexis Algoud
74d495c192
NEW filter actiontype on thirdparty tab
2016-09-08 10:26:38 +02:00
Laurent Destailleur
b107b0644f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:07:17 +02:00
Laurent Destailleur
ba76f12a28
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/product/price.php
htdocs/product/stock/class/mouvementstock.class.php
2016-09-02 19:24:28 +02:00
Laurent Destailleur
70de814c3c
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-09-02 19:03:31 +02:00
phf
fcd5e1fb2c
Fix lost value if use double quote
2016-09-02 15:30:42 +02:00
Laurent Destailleur
7d056f6857
NEW Use small photo of user on all user links
2016-09-01 11:29:30 +02:00
Laurent Destailleur
8fd082cf16
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
45fceaeea5
Fix another field not responsive
2016-08-31 16:14:31 +02:00
Laurent Destailleur
c4ae712bac
Fix responsive design
2016-08-31 16:09:56 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
d6d474f10d
Clean code for category management.
2016-08-29 21:31:27 +02:00
Laurent Destailleur
af070dad94
Fix sort of fields
2016-08-28 23:53:13 +02:00
Laurent Destailleur
385aca8bf2
Fix sort of list and number of records
2016-08-28 23:25:24 +02:00
Laurent Destailleur
5e88de7e2c
Fix field customer/prospect/supplier in list of thirdparties
2016-08-28 15:21:09 +02:00
Laurent Destailleur
2e7e5151b7
Merge pull request #5463 from hregis/develop_origin
...
New: Add entity field in llx_societe_remise_except and llx_societe_remise
2016-08-28 12:23:04 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Regis Houssin
6e40f9e700
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/core/class/html.form.class.php
Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
2016-08-25 10:15:26 +02:00
aspangaro
dd905debb4
Uniformize presentation
2016-08-09 10:19:42 +02:00
Laurent Destailleur
3f87b0c225
NEW Show photo of contacts on thirdparty card.
2016-08-06 00:04:24 +02:00
Laurent Destailleur
33d12a4492
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
aspangaro
dd2e43754e
Uniformize presentation in Thirdparty
2016-08-02 06:02:01 +02:00
Laurent Destailleur
dfc38351ef
Fix $i not initialized
2016-08-01 19:48:39 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
aspangaro
4a0eb496fa
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
...
Conflicts:
htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
63220eae18
Presentation
2016-08-01 04:40:56 +02:00
Laurent Destailleur
33495847b7
Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into
...
aspangaro-4.0-p36
Conflicts:
htdocs/societe/rib.php
2016-07-31 03:05:34 +02:00
Laurent Destailleur
a87c2f9579
Fix several fixes on margin reports
2016-07-30 18:57:26 +02:00
Laurent Destailleur
ceb6199e87
Fix default numbering module of customer code was not enabled.
2016-07-30 12:31:32 +02:00
aspangaro
3c3df0c4f6
Fix Presentation
2016-07-29 23:52:49 +02:00
Laurent Destailleur
45e37c82cd
FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/fourn/facture/list.php
2016-07-29 16:29:31 +02:00
Laurent Destailleur
b85bb8c0f8
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
537a51b367
Finally, better without the test
2016-07-29 11:19:16 +02:00
Sergio Sanchis Climent
b47e6e4520
FIX #5544 Disabled Contact still appear in lists to send emails
2016-07-28 15:58:45 +02:00
Regis Houssin
6bf655c882
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/societe/class/societe.class.php
Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
2016-07-28 09:53:10 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
12514d0f81
FIX #5543
2016-07-27 17:50:38 +02:00
Laurent Destailleur
ee0c77a305
Merge branch 'refactor-rest-api' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api
Conflicts:
htdocs/api/admin/explorer.php
2016-07-27 14:06:14 +02:00
florian HENRY
e420a75fa0
SQL query style
2016-07-26 09:01:28 +02:00
florian HENRY
419dd3095b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
Regis Houssin
4b8f42949c
# WARNING: head commit changed in the meantime
...
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Laurent Destailleur
fc1c38420c
Revert "Fix Performance improvement with many extrafields"
...
This reverts commit ae18178d56
2016-07-25 19:47:07 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Juanjo Menent
ae18178d56
Fix Performance improvement with many extrafields
2016-07-21 18:21:09 +02:00
Laurent Destailleur
0428d9c887
Merge pull request #5525 from aspangaro/4.0-p36
...
Fix: Presentation on thirdparty card
2016-07-21 10:42:56 +02:00
Laurent Destailleur
774e327831
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
9ebe704506
Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128
...
FIX #5128 if create method return duplicated code error
2016-07-21 09:55:26 +02:00
aspangaro
52e5403660
Fix: Presentation on thirdparty card
2016-07-21 06:25:25 +02:00
Laurent Destailleur
e1f3b8e78f
Code comment
2016-07-20 19:32:38 +02:00
Laurent Destailleur
5a8c08e6cc
Merge pull request #5481 from defrance/patch-12
...
NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions
2016-07-20 18:23:35 +02:00
Laurent Destailleur
10cd5ba730
Fix sort of sent notification by date desc
2016-07-18 11:54:35 +02:00
BENKE Charlie
260e296f20
add $result on db->free
2016-07-18 02:05:30 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d
Fix better error message when possible refering objects list is empty.
2016-07-16 14:37:35 +02:00
Laurent Destailleur
9ba1ca5acb
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
BENKE Charlie
c3174e4551
Update societe.class.php
2016-07-15 11:54:37 +02:00
Laurent Destailleur
f758f3466e
Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card
...
NEW : select default bank account on thirdparty card
2016-07-15 11:16:17 +02:00
BENKE Charlie
39bc90baf0
Update societe.class.php
2016-07-14 18:45:15 +02:00
Juanjo Menent
df74fa37de
Merge pull request #5464 from AppChecker/develop
...
Fix: Prevent SQLi
2016-07-13 08:45:00 +02:00
appchecker
7facaac973
replace intval with GETPOST
2016-07-11 12:58:59 +03:00
Laurent Destailleur
7e000d4ce2
Fix missing css opacitymedium
2016-07-11 10:46:44 +02:00
appchecker
931089a924
prevent SQLi
2016-07-07 20:19:05 +03:00
Laurent Destailleur
fec2d86ec5
Fix substitution of __THIRDPARTY_NAME__ failed
2016-07-07 18:56:10 +02:00
Regis Houssin
784880bbd1
Fix: wrong comment
2016-07-07 12:52:38 +02:00
Regis Houssin
961a37d724
Merge remote-tracking branch 'origin/develop' into develop_origin
2016-07-07 12:45:03 +02:00
Regis Houssin
08725003b9
Fix: add entity field in llx_societe_remise, useful when third-sharing
...
is used with multicompany
2016-07-07 12:43:02 +02:00
Regis Houssin
ee02ff43d7
Fix: add entity field in llx_societe_remise_except, useful when
...
third-sharing is used with multicompany
2016-07-07 12:26:30 +02:00
Laurent Destailleur
3c6c509358
Fix compatibility with old behaviour (direct open of card after a
...
search)
2016-07-07 10:26:40 +02:00
florian HENRY
1bb28648c4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
build/pad/DoliWamp.pml
build/pad/Dolibarr.pml
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
2016-07-07 09:05:13 +02:00
Laurent Destailleur
c360189d94
Code comment
2016-07-06 11:14:17 +02:00
florian HENRY
afb924043f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/core/modules/mailings/advthirdparties.modules.php
2016-07-04 20:43:14 +02:00
Laurent Destailleur
23cac5b157
FIX link to check prof id was hardcoded instead of using dedicated
...
function
2016-07-04 10:28:11 +02:00
florian HENRY
32e954c8d8
Merge branch 'develop' of local repository into dev_fix5353
2016-07-01 15:08:15 +02:00
Laurent Destailleur
b12bd9b070
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-01 03:51:59 +02:00
Laurent Destailleur
2c5e1c17fe
Fix hard coded table prefix
2016-07-01 03:42:19 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
florian HENRY
1e4916bd53
better way to manamge IBAN/BIC Mandatory
2016-06-30 16:01:53 +02:00
florian HENRY
d431e73ec8
Fix #5353
2016-06-30 15:49:57 +02:00
Alexis Algoud
fa73dbe8e9
FIX #5128 if create method return duplicated code error
...
not use GETPOST in order to get a new code
2016-06-30 15:12:35 +02:00
arnaud
97fe75f198
FIX #5004
2016-06-30 14:57:23 +02:00
Xebax
e12e1980fc
REST API: Add comments in the @deprecated tags.
2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d
REST API: Bring back the existing API (for backward compatibility).
...
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
2016-06-22 10:08:54 +02:00
Xebax
3b662d6ed8
REST API: improve the API to get/add categories for an item.
...
Move the GET /xxx/{id}/categories requests to the corresponding classes
(Contacts, Products, Thirdparties).
Move the addCustomerCategory() method to the Thirdparties class. Use the
POST verb for the request instead of GET because the request modifies
the state of the server.
2016-06-20 17:56:33 +02:00
Xebax
6d67303501
REST API: move the definition of /contacts/{id}/createUser
...
from api_users.class.php to api_contacts.class.php.
2016-06-20 17:56:33 +02:00
Xebax
04778f932e
REST API: replace the /thirdparty/ API by /thirdparties/.
...
Remove several /thirdparty/list/xxx endpoints because they are redundant
with the /thirdparties/ endpoint whith the 'mode' filter.
Remove the customer/byemail/{email} endpoint because it is redundant
with the /thirdparties/ endpoint whith the 'email' filter.
Remove all the /customer/ endpoints because they do the same thing as
the corresponding /thirdparty/ endpoints.
2016-06-20 17:56:33 +02:00
Xebax
396d31e18e
REST API: begin the refactoring.
...
Simplify the code that looks for the API classes and replace the
/contact/ and /user/ APIs by /contacts/ and /users/.
2016-06-20 17:56:33 +02:00
Laurent Destailleur
6317cb53f2
FIX Merge of 2 thirdparties when there is one common tag.
2016-06-20 15:42:16 +02:00
Laurent Destailleur
b62be8dd0b
Fix: Test table llx_expedition to allow delete of thirdparty
2016-06-20 14:17:17 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
232f525f29
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
630a063283
FIX Can't create thirdparty or validate invoice if profid is mandatory
...
and profid does not exists for other countries
Conflicts:
htdocs/compta/facture.php
2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b
FIX Can't create thirdparty or validate invoice if profid is mandatory
...
and profid does not exists for other countries
2016-06-15 18:21:58 +02:00
Laurent Destailleur
9dade02dba
Fix missing test on $error
2016-06-07 20:52:43 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Juanjo Menent
8f617b196a
Fix printing following the rules
2016-06-04 15:51:28 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
2016-06-04 00:58:16 +02:00
phf
778b05c341
Fix #4632
2016-06-03 23:06:53 +02:00
gauthier
ab06ffda58
NEW : select default bank account on thirdparty card
2016-06-03 15:43:05 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Florian HENRY
41a41f8931
FIX #5209
2016-05-31 22:55:49 +02:00
Laurent Destailleur
cc68b885a3
Fix minor css errors
2016-05-30 22:39:26 +02:00
Laurent Destailleur
58ba5838ce
Fix alias name already visible into banner
2016-05-30 19:41:28 +02:00
Laurent Destailleur
3cc8207bb7
FIX Filter on category tag for suppliers
2016-05-30 17:20:34 +02:00
Laurent Destailleur
46a0f3dab0
Fix minor bugs
2016-05-30 01:30:28 +02:00
Laurent Destailleur
1617f3c62a
Fix colspan
2016-05-24 20:24:51 +02:00
Josep Lluís
0ad21be132
Fix bug: filter third parties without categories
...
There is a bug on filter third parties without categories. No records found.
2016-05-18 19:27:57 +02:00
florian HENRY
4e98f57385
FIX : php strict warning
2016-05-17 09:02:22 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
05cbfbb38f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2016-05-17 01:19:49 +02:00
Laurent Destailleur
75b4c61fbc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/card.php
2016-05-17 00:02:54 +02:00
gauthier
84e75eed88
FIX : can't fetch by siret or siren because of first "if"
2016-05-10 09:31:25 +02:00
Laurent Destailleur
5cf8612c58
Fix scrutinizer errors
2016-05-08 12:08:23 +02:00
Laurent Destailleur
3784af00ea
NEW Selection of fields is available on member list
2016-05-07 18:50:05 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-05-06 19:10:59 +00:00
Laurent Destailleur
b4e5acbaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2016-05-04 14:43:40 +02:00
Laurent Destailleur
de59d115d9
Option THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT and
...
THIRDPARTY_SUPPLIER_BY_DEFAULT to have fields customer/prospect/supplier
set when creating a new thirdparty.
2016-04-30 14:59:40 +02:00
Laurent Destailleur
d7ea8139fe
Merge pull request #5103 from fappels/develop-fix-societe-update
...
Fix #5100 Develop unable to create new third party
2016-04-29 20:22:03 +02:00
nka11
98f757a87a
New API methods
...
add user to group
get product list by category id
2016-04-27 08:59:12 +02:00
fappels
6bf52558e4
Fix #5100 Develop unable to create new third party
...
Only set fk_stcomm if available
Do not set 'null' into float databasefield
2016-04-25 12:13:28 +02:00
Laurent Destailleur
3ba87be4ef
Merge pull request #5029 from marcosgdf/deprecated-functions
...
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-21 01:18:22 +02:00
Laurent Destailleur
30f7d4cd52
Merge pull request #5027 from marcosgdf/refactor-option
...
Refactored Form classes to use Form::selectarray instead of HTML code
2016-04-21 01:15:59 +02:00
Laurent Destailleur
da329131bb
Merge pull request #4959 from nka11/api_dev
...
API Improvements
2016-04-19 19:13:57 +02:00
Laurent Destailleur
d40e659b30
Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
...
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
Laurent Destailleur
448ca49e28
Fix bad field
2016-04-18 21:10:30 +02:00
nka11
39948968eb
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev
2016-04-18 19:13:06 +02:00
Marcos García de La Fuente
21ba24a0cd
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-16 22:13:55 +02:00
Marcos García de La Fuente
863efcbc5d
NEW Removed unused FormOrder::selectSourcesCommande function
...
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
2016-04-16 21:33:23 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
nka11
132cdd9ed4
Fix coding style errors
2016-04-10 14:15:38 +02:00
nka11
65e4273fdf
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev
2016-04-10 14:00:00 +02:00
nka11
d0356d6bd0
new api class for accounts, filtering on order api
2016-04-10 13:57:53 +02:00
Marcos García de La Fuente
a41a80b8fe
Merge branch 'develop' into oop-refactor-bankaccount-tostring
2016-04-09 23:17:09 +02:00
nka11
5967330004
merge api_customer to api_ thirdparty
2016-04-09 21:39:12 +02:00
Scrutinizer Auto-Fixer
051ccf30a1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 17:32:05 +00:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
010a4f8929
Merge pull request #4945 from frederic34/shipcust
...
NEW : Select Preferred Sending Method for a third party
2016-04-08 21:31:06 +02:00
Laurent Destailleur
daa1aed363
Bad placeholder
2016-04-08 19:31:18 +02:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
nka11
f3ae67a434
added customer API
2016-04-06 10:19:25 +02:00
frederic34
198b9ce8fe
Select Preferred Sending Method for a customer
2016-04-04 18:28:55 +02:00
Laurent Destailleur
43165bab02
FIX Filter/search on extrafields on lists
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5
FIX Filter/search on extrafields on lists
2016-04-04 16:02:29 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
97b5026ad8
Uniformize code and css
2016-04-01 16:18:45 +02:00
Laurent Destailleur
feb35adbe1
FIX Missing clean of criteria
2016-04-01 12:04:07 +02:00
Laurent Destailleur
fea9c65906
FIX Missing clean of criteria
2016-03-31 15:22:43 +02:00
Laurent Destailleur
54f3005666
NEW Can select fields to show on proposal lists.
2016-03-31 11:58:05 +02:00
Laurent Destailleur
98c2ba8c61
Normalize code
2016-03-29 15:41:46 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d
Revert "Corrected non-static usages of Form::multiselectarray function"
...
This reverts commit 0a53cdd88f
2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f
Corrected non-static usages of Form::multiselectarray function
2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Marcos García de La Fuente
889c72611d
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-03-19 23:00:33 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
227e27bf4a
Merge pull request #4845 from simnandez/3.9
...
FIX: Can not select a commercial on the creation of a third
2016-03-18 14:17:08 +01:00
Laurent Destailleur
fb625f0ca7
FIX #4812
2016-03-18 13:58:06 +01:00
Juanjo Menent
875f4023de
FIX: Can not select a commercial on the creation of a third
2016-03-18 13:16:33 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
619ebf9a3e
Enhance css of search fields
2016-03-13 20:38:16 +01:00
aspangaro
5d88c10e94
Missing language file
2016-03-13 08:33:34 +01:00
Laurent Destailleur
a8602dbec2
Fix alignement on extrafields
2016-03-10 16:00:44 +01:00
Laurent Destailleur
2e1a63a1f3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/compta.lang
htdocs/societe/class/societe.class.php
htdocs/societe/commerciaux.php
htdocs/societe/consumption.php
2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
2016-03-10 15:03:53 +01:00
Marcos García de La Fuente
199597f93a
FIX #4777 Error creating thirdparty with PostgreSQL
...
Close #4777
2016-03-09 14:46:09 +01:00
Laurent Destailleur
c907ca85c9
Fix css
2016-03-08 20:32:41 +01:00
Laurent Destailleur
043abdce03
Fix sql error
2016-03-08 20:30:09 +01:00
Laurent Destailleur
4b0b1fb5f6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/societe/consumption.php
2016-03-08 20:29:10 +01:00
Laurent Destailleur
e0cef69685
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-08 20:21:42 +01:00
Laurent Destailleur
9f3f477877
FIX Navigation in result
2016-03-08 20:21:16 +01:00
Laurent Destailleur
881eca9fe5
Fix search on product ref
2016-03-08 19:46:42 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Juanjo Menent
5fb6db9da3
Merge pull request #4732 from hregis/3.8_bug
...
Fix: compatibility with multicompany transversal mode
2016-03-06 14:45:21 +01:00
Regis Houssin
5292920a84
Fix: don't see the sales representative of anothers entities
2016-03-04 17:10:42 +01:00
Regis Houssin
735a1c075e
Fix: best sql request
2016-03-04 16:48:53 +01:00
Laurent Destailleur
87093c79f9
Merge pull request #4708 from marcosgdf/account-constants
...
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
a73b53ff9c
Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty
...
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
2016-03-04 16:18:15 +01:00
Regis Houssin
967ae720ef
Fix: compatibility with multicompany transversal mode
2016-03-04 15:51:34 +01:00
Laurent Destailleur
f06911a8b0
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
ca1860a08b
Merge pull request #4720 from hregis/3.8_bug
...
Fix: compatibility with multicompany transversal mode and more security issue
2016-03-04 15:34:24 +01:00
phf
e03f4b4de9
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
2016-03-04 12:21:14 +01:00
Laurent Destailleur
974879ea9d
NEW Disabled users are striked.
2016-03-03 20:20:04 +01:00
Laurent Destailleur
aa34dffef5
Search on select list is supported for extra fields
2016-03-03 12:09:13 +01:00
Laurent Destailleur
360e202582
Add fields to search on extrafields
2016-03-03 11:39:13 +01:00
Regis Houssin
6fd5334812
Fix: compatibility with multicompany transversal mode and more security
...
issue
2016-03-03 10:10:55 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Marcos García de La Fuente
dcde7773a3
Started using Account TYPE and STATUS constants
2016-03-02 11:04:52 +01:00
Laurent Destailleur
d2c71fbf8f
Fix alias name was visible twice.
2016-02-29 10:35:18 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
4dd50460d3
Fix MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error in name
2016-02-27 15:50:06 +01:00
aspangaro
c907cd139c
Lot of corrections
2016-02-27 08:15:58 +01:00
aspangaro
41fb60e4a2
Fixed: comestic correction of company card
2016-02-27 06:38:48 +01:00
Laurent Destailleur
371dec8503
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/langs/en_US/products.lang
htdocs/langs/fr_FR/companies.lang
2016-02-24 12:13:12 +01:00
Laurent Destailleur
2747259fbd
Fix: missing payment term and condition into update method
2016-02-24 12:01:50 +01:00
Laurent Destailleur
d128df1fe5
Fix js error .submit is not a function
2016-02-22 14:33:14 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
54a4570b5f
FIX #4580
2016-02-21 20:57:15 +01:00
Laurent Destailleur
7765e37101
Better support of option SOCIETE_SORT_ON_TYPEENT
2016-02-19 21:09:36 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
Laurent Destailleur
d0b657f6e7
Fix filter on products with spcific prices on thirdrty tab "customer
...
prices"
2016-02-15 02:15:29 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
006c546a87
Fix select number of records in list
2016-02-13 10:51:42 +01:00
Laurent Destailleur
298be09ee2
Uniformize behaviour by adding the back to list on thirdparty card
2016-02-13 03:38:56 +01:00
gauthier
756b50b9d3
FIX : search product in customer product prices doesn't work
2016-02-12 12:06:23 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
67dbb1571c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-30 16:29:20 +01:00
Laurent Destailleur
9a87d2bee5
Fix phpcs
2016-01-30 16:28:48 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
d21908755e
FIX Import/Export NPR VAT
2016-01-30 15:29:35 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
2016-01-22 03:18:51 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
Laurent Destailleur
7f4c37da5f
NEW Add state into list of fields available for personalized fields of
...
thirdparties
2016-01-15 23:48:06 +01:00
Laurent Destailleur
23dd6b8388
Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
...
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:35:55 +01:00
fmarcet
79992b4947
FIX: The third dashboard don't consider user permissions
2016-01-12 11:34:50 +01:00
Laurent Destailleur
3c5eaf87d5
Fix dol_fiche_head and end missing
2016-01-07 18:48:46 +01:00
Laurent Destailleur
0eae624a60
Add protection to avoid packaging external tested modules
2016-01-07 18:13:15 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Laurent Destailleur
0314b3b5b1
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
2016-01-02 12:27:08 +01:00
braito4
9b3533e753
FIX #4326 PHP7 Warning
2016-01-02 11:42:43 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
Marcos García de La Fuente
bec00e37e0
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
2015-12-28 15:04:24 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
2d3915b88c
Fix hook implementation on some thirdparty pages
2015-12-23 14:31:42 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
Juanjo Menent
442006dba5
Merge pull request #4265 from grandoc/develop
...
[Qual] Uniformize code
2015-12-21 20:59:25 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
Laurent Destailleur
dcbad8bb15
Fix delete of image
2015-12-21 17:32:20 +01:00
philippe grand
8e8c6b1534
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-12-21 14:22:45 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
philippe grand
7a33e2983d
[Qual] Uniformize code
2015-12-20 10:36:20 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
philippe grand
2cd49043a6
[Qual] Close database handler should be after Footer
2015-12-11 19:37:12 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
9aaab2c1dc
Work on select fields on project list
2015-12-02 23:20:19 +01:00
fmarcet
208bf2545f
Fix: Bug when idprof is mandatory on thrid creation and we use
...
multicompany
2015-11-26 17:14:03 +01:00
Maxime Kohlhaas
826592c480
Fix info and banner on societe
2015-11-19 14:43:00 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
db941d5395
NEW Enhance style engine. Add option to set color of links
2015-11-15 11:31:09 +01:00
Laurent Destailleur
e2e804e37a
Minor fix
2015-11-13 00:30:10 +01:00
Laurent Destailleur
59a79442b0
Enhance code for select field list feature.
...
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Marcos García de La Fuente
3bbedf1795
FIX #3707 Thirdparty bank account page table has a glitch
2015-11-07 13:39:34 +01:00
Laurent Destailleur
e26940ddf7
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
3ba194f638
NEW Can select fields to show into the contact list
2015-11-03 15:32:16 +01:00
Laurent Destailleur
74be7bf334
FIX Filter in customer price per product of a thirdparty returned error
2015-11-03 11:40:06 +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
1ee9594e38
Merge pull request #3846 from frederic34/patch-21
...
Correction double translation which give bad html display
2015-11-02 11:29:04 +01:00
aspangaro
cc257d8abc
Typo
2015-11-01 22:54:33 +01:00
Frédéric FRANCE
0f6a401edd
Update list.php
2015-10-31 11:30:11 +01:00
Laurent Destailleur
3760f247a2
NEW Can now select fields to show in product list. Extrafields are also
...
supported.
2015-10-30 00:05:00 +01:00
Laurent Destailleur
c481dc88ce
Clean dead code
2015-10-29 20:25:07 +01:00
fmarcet
440df980ea
Fix SQL Query
2015-10-29 13:43:07 +01:00
fmarcet
dba952e596
Fix: Products image on getNomUrl
2015-10-29 12:51:25 +01:00
aspangaro
f15e672c56
Typo
2015-10-26 05:40:34 +01:00
Laurent Destailleur
132bc610b6
Icon for contact contains a part of thirdparty icon to make things
...
easier to understand
2015-10-25 23:32:49 +01:00
Laurent Destailleur
1261ad43a1
NEW Can select which field to show into list of users.
2015-10-25 18:15:37 +01:00
Laurent Destailleur
1b8234d9fe
Bette behaviour for blind people
2015-10-25 11:09:50 +01:00
Laurent Destailleur
5181afd49d
Disable dead code
2015-10-24 19:29:41 +02:00
Laurent Destailleur
3015a0388a
NEW List of projects of a thirdparty are visible on a project tab
2015-10-24 16:09:26 +02:00
Laurent Destailleur
8d24adc97e
Remove 2 other duplicated pages. There is only one page now for all list
...
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
2015-10-23 13:52:51 +02:00
Laurent Destailleur
531ef43a27
Some minor look fixes.
2015-10-22 19:13:16 +02:00
Laurent Destailleur
474692e71a
Remove duplicate page fourn/list.php
2015-10-22 09:48:16 +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
philippe grand
1762b3aaa7
[Qual] Uniformize code
2015-10-17 17:09:34 +02:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
537a13e2f4
NEW Show which fields are used for search when doing a generic search
...
from the quick search form.
2015-10-17 00:14:36 +02:00
Laurent Destailleur
45a2156d71
Uniformize code and add more fields selectable for list of thirdparties
2015-10-16 23:03:20 +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
df0c6aa5cf
Use the new card banner for members
2015-10-16 16:14:33 +02:00
Laurent Destailleur
ebdc402832
No value set when using the generic new thirdparty feature
2015-10-16 15:05:05 +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
2c6aeac64f
FIX : Societe::set_parent() function needs societe object to be fetched to update parent
2015-10-15 16:48:52 +02:00
Raphaël Doursenaud
6c2b46f939
Fix #3728 Properly remove last category
2015-10-15 10:15:37 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
e9aed15bed
Work on the feature to select which field to show
2015-10-14 18:48:03 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
Laurent Destailleur
bd48ad265d
The new banner tab is also on user card now
2015-10-11 15:21:21 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
Laurent Destailleur
0032ad695c
New look for thirdparty tab using the new common banner. End. Let's do
...
the same for other tabs and elements now...
2015-10-10 13:12:14 +02:00
Laurent Destailleur
0222867a94
The new banner for tab is moved into a shared functions
2015-10-10 12:01:09 +02:00
Laurent Destailleur
f4f7629037
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511
Start to work on a common banner for tabs (goal is to have a nicer and
...
generic part for all element)
2015-10-10 01:51:12 +02:00
Laurent Destailleur
f29c03c922
Start to work on a multiselect component to select which fields to show
...
into dolibarr lists.
2015-10-09 16:35:14 +02:00
Raphaël Doursenaud
497c751fb9
Fix: remove debugging leftover
2015-10-09 16:24:42 +02:00
Laurent Destailleur
82428fea68
NEW: Only arrow of current sorted field is visible into table views.
...
This save a lot of spaces. You can click on the column title to sort.
This make clickable area larger and click to sort is easier.
2015-10-09 13:01:50 +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
Laurent Destailleur
8d47a307bb
Better use of space
2015-10-06 21:52:42 +02:00
Laurent Destailleur
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +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
e4014bf01d
Merge pull request #3655 from frederic34/patch-14
...
Update index.php
2015-10-04 20:11:09 +02:00
Laurent Destailleur
0df42bc5ea
FIX Filter on status of thirdparty list and bad encoding of url
2015-10-04 19:37:49 +02:00
frederic34
1e8ff69267
Optioncss
2015-10-04 13:34:55 +02:00
frederic34
9a021e6de4
Optioncss not kept in list
2015-10-04 10:45:57 +02:00
Frédéric FRANCE
0cfa112cf2
Update index.php
2015-10-03 22:35:26 +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
Laurent Destailleur
a9e55fd08f
FIX Missing contracts into list in page of Refering objects of a
...
thirdparty.
2015-10-03 12:57:58 +02:00
Laurent Destailleur
996c9ca2ba
FIX Can't change state on a contact
2015-10-03 12:21:27 +02:00
Laurent Destailleur
b6a83ed5a6
FIX Can't delete thirdparty if there is some discounts
2015-10-03 12:20:50 +02:00
Raphaël Doursenaud
f0466ba313
FIX #3607 Better categories setting and unsetting
...
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
2015-09-30 18:47:02 +02:00
Laurent Destailleur
1851310bbe
NEW Add cancel button on thirdparty create page
2015-09-29 14:31:55 +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
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
40425d427d
Merge pull request #3593 from GPCsolutions/deprecatedclasses
...
[Qual] Constructors of deprecated classes are deprecated
2015-09-26 08:45:03 +02:00
Juanjo Menent
c726afe3bc
Merge pull request #3592 from GPCsolutions/select_users
...
[Qual] Replaced deprecated select_users()
2015-09-26 08:44:34 +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
fmarcet
b5b90d1639
FIX #3599 Not saving legal form
2015-09-25 08:50:00 +02:00
Raphaël Doursenaud
5f5ef43e04
[Qual] Constructors of deprecated classes are deprecated
...
This gives better deprecation hinting.
2015-09-24 20:35:59 +02:00
Raphaël Doursenaud
b0b552c378
[Qual] Replaced deprecated select_users()
2015-09-24 20:32:35 +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
Laurent Destailleur
e62bb4da13
Make parameter required
2015-09-23 00:09:32 +02:00
Laurent Destailleur
0821f18712
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-18 21:50:10 +02:00
Laurent Destailleur
e85ddbb470
Merge pull request #3537 from GPCsolutions/3.8-3533
...
FIX #3533 Load categories language
2015-09-18 20:48:58 +02:00
Laurent Destailleur
4195eb3366
NEW Color category is visible onto the thumb of tags on thirdparty, or
...
products cards.
2015-09-17 20:20:03 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Raphaël Doursenaud
6ffdbf91ec
FIX #3533 Load categories language
2015-09-16 21:35:20 +02:00
Laurent Destailleur
7d8013b371
FIX #3533
2015-09-16 21:34:01 +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
Florian HENRY
a49f88c259
reveiw thirdparty list and add column and filter on country and typeent
2015-09-10 11:55:05 +02:00
Laurent Destailleur
615734012e
Merge pull request #3476 from marcosgdf/refactor
...
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +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
Laurent Destailleur
77ef046af4
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:02:21 +02:00
Marcos García de La Fuente
865489db75
Created Adherent::hasDelay function
2015-09-05 11:03:37 +02:00
Laurent Destailleur
3315978fd3
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-30 21:22:28 +02:00
Raphaël Doursenaud
cea47f3e25
Added tags/categories management to suppliers
...
Suppliers part of #2571
2015-08-26 19:30:55 +02:00
Laurent Destailleur
15ab9c0ecd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/stock/mouvement.php
2015-08-20 16:08:42 +02:00
Laurent Destailleur
da8e71b2c5
Fix #3309
2015-08-20 16:05:29 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
04812bf422
Fix date not visible and label of edit button not correct
2015-08-13 03:38:23 +02:00
Laurent Destailleur
4a6239f9a7
Fix no default value for dangerous actions
2015-08-13 02:52:58 +02:00
Laurent Destailleur
4a124c6ee9
Merge pull request #3350 from tomours/develop
...
FIX #3349 Checking a VAT number with spaces
2015-08-12 23:51:37 +02:00
tomours
ef5d394b84
FIX #3349 Allow checking a VAT number with spaces
...
One of the first things I did, while starting to try Dolibarr, was to fill info about my company.
I filled my VAT number : "FR 13 794..." and saw the "check" button.
Oh, that's nice ! Click. Didn't work :(
In fact, it didn't work because the webservice Dolibarr uses to check VAT numbers doesn't understand spaces.
By doing this we could enter good looking VAT numbers (with spaces) and still check them.
2015-08-10 15:10:47 +02:00
Marcos García de La Fuente
2f6587b48e
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
...
Close #3211
2015-08-09 18:08:22 +02:00
Florian HENRY
d6776e1155
FIX : Error management in societe/soc.php
2015-08-03 11:39:24 +02:00
Laurent Destailleur
85f344a23e
Fix bad link
...
Fix missing css
2015-07-19 23:39:07 +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
Laurent Destailleur
2e2f99c351
Merge branch 'bug-3180' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-3180
Conflicts:
ChangeLog
2015-07-19 11:28:48 +02:00
Laurent Destailleur
4100026c71
Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-3268
Conflicts:
ChangeLog
2015-07-19 11:27:28 +02:00
Marcos García de La Fuente
3d6c5b09e8
Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter
...
Close #3268
2015-07-19 11:19:47 +02:00
Laurent Destailleur
eec1f4dcdf
Merge pull request #3267 from Dolibarr/3.8
...
fix user role and uk_user_api_key if api module not enabled
2015-07-18 23:51:51 +02:00
Marcos García de La Fuente
b28c4df0d6
Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result
...
Close #3180
2015-07-18 17:35:36 +02:00
aspangaro
d9dd9ff688
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-16 12:25:37 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
4d6ce2a1de
Fix: Can't view thirdparties that are not customer nor prospect nor
...
supplier.
2015-07-15 12:42:50 +02:00
Regis Houssin
394f8fbf91
Fix: for avoid mysql error with canvas
2015-07-14 17:18:41 +02:00
Laurent Destailleur
324d855b9c
Still working on project module to uniformize way of working with other
...
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
276f057acf
Clean trigger codes
...
Better error message when we insert duplicate barcode.
2015-06-30 16:10:03 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
fmarcet
c9c1247a28
FIX: Payed invoices are showed as canceled
...
FIX: Bad date filter on customer order
2015-06-24 09:01:39 +02:00
Laurent Destailleur
4db562c9e7
Tags are shown as thumbs into card.
2015-06-22 22:31:44 +02:00
Laurent Destailleur
cac7b1f49f
NEW Add hooks on list of members to allow an external module to add more
...
fields into list view.
2015-06-22 16:34:25 +02:00
Laurent Destailleur
5a8e763099
Uniformize code for hooks
...
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
a3a5b0d9b0
Upgrade jquery and jquery-ui to last stable version
2015-06-21 00:06:37 +02:00
Laurent Destailleur
825369230f
Finishment of look
2015-06-20 23:33:13 +02:00
Laurent Destailleur
a6a027f5c4
Fix several pb with javascript
2015-06-20 17:24:34 +02:00
Laurent Destailleur
425d9bff48
Tooltip to make understanding better.
2015-06-18 19:33:29 +02:00
Laurent Destailleur
8df56511be
NEW Enhance prototype, project list and proposal list with new hook to
...
have an external module able to add more fields.
2015-06-16 19:36:44 +02:00
fmarcet
05cb1f7ba7
Fix: Date filter on customer orders
2015-06-16 16:59:48 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6
Merge pull request #2412 from marcosgdf/commercial-name
...
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
aspangaro
a4acc867aa
Typo "inra_vat"
2015-06-14 20:24:25 +02:00
aspangaro
f973a1fb43
Typo "cibility"
2015-06-14 20:15:22 +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
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Marcos García de La Fuente
60711d35b8
FIX Close bug #2900 Courtesy title is not stored in create thirdparty form
2015-06-12 15:53:58 +02:00
Laurent Destailleur
ed0e6753e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-12 13:09:32 +02:00
Laurent Destailleur
d2843ceabb
Add field frstrecur to be managed by withdrawal module.
2015-06-11 19:16:29 +02:00
Laurent Destailleur
4a18b730b5
Fix: Avoid warning in expense report validation
...
Fix: navigation in expense report
2015-06-08 13:49:09 +02:00
Laurent Destailleur
101a9a4cf3
Fix: object user must not be overwritten
2015-06-07 19:35:47 +02:00
Laurent Destailleur
37cadaf4bf
Fix the trigger on delete thirdparty was not called
2015-06-07 03:41:12 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +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
ee986b1a2b
Debug merge thirdparty feature.
2015-06-05 15:15:05 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:02:50 +02:00
Laurent Destailleur
4c7ccf6145
NEW Can filter on contact status in prospect list. Removed deprecated
...
menu entry.
2015-06-05 10:49:02 +02:00
Laurent Destailleur
14b1fb845f
Remove useless tab of categories
2015-06-05 09:57:41 +02:00
Laurent Destailleur
bbd8a712cf
Merge pull request #2932 from GPCsolutions/dolibarr-2571
...
Added tags/categories management to customers
2015-06-05 09:44:06 +02:00
Laurent Destailleur
331ebbdd73
Fix behaviour on grey/visible menu must be same everywhere on
...
application.
2015-06-04 11:42:24 +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
3588d73c8e
Fix css
2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5
NEW Use new select2 component for juridical status, country and state
...
selection.
2015-05-31 12:25:33 +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
5e773d4cb6
Work on finishing of style
2015-05-31 01:06:51 +02:00
Raphaël Doursenaud
bbd0b89087
Added tags/categories management to customers
...
Customers part of #2571
2015-05-29 18:50:43 +02:00
atm-ph
74c4db0f57
Remove comment
...
This comment is false, my $_SESSION was wrong
2015-05-26 11:23:25 +02:00
phf
3c0da7e2d7
FIX : extrafields required on thirdparty
2015-05-26 10:54:31 +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
Laurent Destailleur
a33809a526
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
2015-05-25 17:46:42 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
4319cd63a3
Working on finishing of look
2015-05-22 14:28:02 +02:00
Laurent Destailleur
6f5a30638c
NEW On page to see/edit contact of an ojbect, the status of contact is
...
visible (for both external and internal users).
2015-05-22 12:21:36 +02:00
Laurent Destailleur
e075fce5eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae
Enhance style
2015-05-21 01:32:56 +02:00
Raphaël Doursenaud
a7f6bbd316
Properly escape untrusted data to prevent HTML injection.
...
First pass for #2857
2015-05-20 17:34:00 +02:00
Laurent Destailleur
55b9d97081
Fix PHPCS
2015-05-20 15:22:59 +02:00
tysauron
d29aa083cf
Bug : Declaration of CompanyBankAccount::create() should be compatible with Account::create($user = '')
2015-05-19 11:30:14 +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
Laurent Destailleur
e561481f1e
Add option THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT and
...
THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT
2015-05-18 10:58:04 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7
Merge remote-tracking branch 'upstream/develop' into commercial-name
2015-05-15 11:17:21 +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
Marcos García de La Fuente
fb01f89e95
Unwanted deletion
2015-05-10 12:44:36 +02:00
Marcos García de La Fuente
9988b1ad4e
Revert 25812f0
2015-05-10 12:43:21 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +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
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
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
jfefe
3b1f6e8a5a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
2015-05-05 12:56:10 +02:00
jfefe
db5a2bacd1
Bad sort field
2015-05-05 12:42:56 +02:00
Laurent Destailleur
c89c89c73e
Mutualise code and some fixes for stock management.
2015-05-04 22:02:54 +02:00
jfefe
18def27eb6
Change API route for thirdparties lists
...
Use /thirdparty/list instead of /thirdparties/
2015-05-04 01:31:23 +02:00
jfefe
0673e3a1f1
Fix API lists method for thirdparty and contact
2015-05-04 00:33:44 +02:00
jfefe
53f480708f
Merge branch 'develop' into api_restler
2015-05-03 23:43:13 +02:00
jfefe
8fd03fa87e
Add API class for contacts
2015-05-03 21:12:18 +02:00
jfefe
60d6cc5806
Modify search of API classes for module
...
A module can now bring several API classes.
By example, thirdparty module can have api_thirdparty.class.php for thirdparty and api_contact.class.php for contacts.
Classes must be named <Object>API (ie ThirdpartyApi or ContactApi)
2015-05-03 19:43:49 +02:00
jfefe
80b832e90c
Add API methods to retrieve customers, prospects and others
2015-05-03 19:13:14 +02:00
jfefe
0d14cb8709
Modify thirdparty delete() method to pass user object as an argument.
2015-05-03 18:44:42 +02:00
jfefe
a8ee123bb2
Add API methods to create, update and delete a thirdparty
2015-05-03 18:30:59 +02:00
jfefe
64d0a710f7
API tirdparties list
2015-05-03 16:59:47 +02:00
jfefe
47c3724f3d
Verify API access by user to resource
...
API authentication mechanism is supposed to be working with internal or external users
2015-05-03 14:44:37 +02:00
jfefe
31e5b4786a
Fix : verify access method
...
Now we can use tag '@class' into PHPDoc block of method or class.
By example: @class DolibarrApiAccess {@requires user,external}
2015-05-03 01:54:04 +02:00
jfefe
fa494369b8
New : API key authentication
...
One key is stored by user when login API method is called. Each API request must have api_key parameter
2015-05-02 23:54:35 +02:00
jfefe
1536cd430d
Missing PHPDOC for REST API working for thirdparties
...
These tags are very important for REST API. Please have a look at https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md
2015-05-01 16:16:31 +02:00
jfefe
30c901c266
Begin REST API implementation with thirdparty classes and methods needed.
...
Work in progress !
2015-05-01 16:12:30 +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
Laurent Destailleur
3a4ad7c038
Bad colspan
2015-04-19 01:09:30 +02:00
Laurent Destailleur
b7ffdba55f
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-04-19 01:00:48 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Maxime Kohlhaas
5a66e1f98a
Fix : include facture class for outstanding bill
2015-04-19 00:26:05 +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
jfefe
25812f0071
Add picto for commercial pages titles
2015-04-18 23:17:44 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +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
jfefe
bee5af4d9e
Fix : bad usage of empty function with GETPOST
2015-04-18 19:56:36 +02:00
Juanjo Menent
c5d8fa4602
Fix: solves #2644
2015-04-18 19:14:30 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Maxime Kohlhaas
8b307aac56
Fix : customer outstanding was not calculated properly
2015-04-18 18:06:27 +02:00
Florian HENRY
3d8a7ee179
Start email template selector
2015-04-18 11:06:53 +02:00
Laurent Destailleur
97cdc55839
NEW Module notification should details of emails into confirm box, not
...
only number.
2015-04-13 17:04:18 +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
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
1efa5bcabd
Fix: Avoid duplicate tooltip
2015-04-08 12:44:11 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +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
611406b75e
Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty
2015-04-04 17:34:06 +02:00
Laurent Destailleur
d8db32a99c
NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
...
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
2015-04-01 21:00:51 +02:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +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
Laurent Destailleur
73b2e0bd01
Merge pull request #2471 from marcosgdf/refactor
...
refactor
2015-03-29 16:17:36 +02:00
Frédéric FRANCE
375e0b7e2a
PhotoInTooltip for getNomUrl company
2015-03-27 08:32:51 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
d678b554e0
Fix css
2015-03-22 18:39:05 +01:00
Laurent Destailleur
49824a0e56
Method colorStringToArray can accept the #
...
Method monthArray can return short label of month
2015-03-22 18:17:25 +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
Laurent Destailleur
f44d91e153
NEW: The notification module accept keyword __SUPERVISOR__ to send
...
notification to supervisor of user.
2015-03-19 11:47:30 +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
daf853d040
Merge pull request #2455 from aspangaro/develop-ReviewER
...
QUAL: Traduce terms + remove <center>
2015-03-16 02:11:29 +01:00
Laurent Destailleur
79ca1fe147
Clean code.
2015-03-15 23:32:43 +01:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +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
2e68b51a10
Merge remote-tracking branch 'upstream/develop' into develop
2015-03-15 17:52:07 +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
2a09e34bdf
Uniformize etrafields visibility for thirdparties card
2015-03-14 13:05:28 +01:00
Laurent Destailleur
687e3d250b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/fixdosfiles.sh
htdocs/core/tpl/objectline_edit.tpl.php
2015-03-13 17:46:31 +01:00
Laurent Destailleur
dfe1ee7e7d
Fix: count of notification emails was wrong
2015-03-13 14:11:59 +01:00
Laurent Destailleur
59cbde042c
Generalize option MAIN_HTML_TITLE for all tabs of thirdparty.
2015-03-12 17:29:52 +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
154865f545
Fix return error when it is not
2015-03-10 16:37:39 +01:00
Laurent Destailleur
0df2b4cc26
Fix check parameters
2015-03-10 16:14:46 +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
d119397129
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-05 11:38:16 +01:00
Laurent Destailleur
dc15eee533
Fix: missing dependcy on project to check before deleting
2015-03-05 11:21:58 +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
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
0170d409d3
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2015-03-04 10:16:25 +01:00
Laurent Destailleur
fddbca50b1
Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of
...
tracking id into email.
2015-03-03 18:33:53 +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
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +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
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Marcos García de La Fuente
e3853a648f
Redundant code
2015-02-25 19:44:12 +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
Laurent Destailleur
e7a82c89e6
Merge pull request #2351 from mrsof/develop
...
FIX : Let ability to use IDPROF verifications even if new entry is "priv...
2015-02-19 09:36:45 +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
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
frederic34
9d0ffb7e85
Add php-iban and check IBAN
2015-02-17 10:23:31 +01:00
Sof
09013c7e1c
FIX : Let ability to use IDPROF verifications even if new entry is "private"
...
We do not check for duplicate or empty id_prof fields while inserting a new entry when verifications options are set to "ON" in the third party configuration panel.
2015-02-12 13:00:22 +01:00
phf
560d836943
[CORE] corrections mineurs sur des tests (#incoterm).
2015-02-10 12:21:29 +01:00
phf
791bd7e9d9
[CORE] retrait la page de configuration et des tests sur la variable d'activation du module qui est inutile (#incoterm).
2015-02-10 11:45:23 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
phf
23751c75dc
[CORE] fin de la mise en place de la gestion incoterms des sociétés (#incoterm).
2015-02-10 10:22:38 +01:00
phf
62762f82a9
[CORE] incorporation de l'ajout / modification de l'incoterm sur un tiers (#incoterm
2015-02-09 17:55:43 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Laurent Destailleur
52222ecdfe
Avoid tooltip into tooltip
2015-02-01 01:28:15 +01:00
Laurent Destailleur
1e38227c2d
Reduce number of new to save memory usage.
...
Fight table to replace with div
2015-02-01 00:54:26 +01:00
Laurent Destailleur
34cbcad9da
Reduce number of new to save memory usage.
...
Fight table to replace with div
2015-02-01 00:40:42 +01:00
Laurent Destailleur
7501e09738
Fix: Crazy change
2015-01-31 22:29:31 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
14be79d3e8
Better help
...
Bad var
2015-01-28 20:04:18 +01:00
phf
903f739449
[CORE] avancement du mercredi matin (#new_ask_price).
2015-01-28 10:33:15 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
925aa2039b
Tooltip and cache for boxes
2015-01-23 10:51:12 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
1dd76e2ec0
Avoid request if possible
2015-01-18 19:15:23 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
30abacd0a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 14:42:42 +01:00
Laurent Destailleur
8cd46e4830
Introduce option MAIN_HTML_TITLE to start to control format of html
...
title content.
2015-01-17 14:34:16 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e
Fixed: use object
2015-01-15 03:11:06 +01:00
Laurent Destailleur
ccfbd3614e
Not nice looking
2015-01-15 02:09:28 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Laurent Destailleur
8abbac564b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/main.inc.php
2014-12-30 04:28:09 +01:00
Laurent Destailleur
3848daeab8
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
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/filefunc.inc.php
htdocs/product/stats/facture.php
2014-12-30 04:20:50 +01:00
Laurent Destailleur
75dbcf4a78
Fixed: doxygen
2014-12-26 04:35:48 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
63f2bfed24
Fixed: Maxi debug of withdrawal module.
2014-12-09 11:19:16 +01:00
Laurent Destailleur
e95160c218
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/user/agenda_extsites.php
2014-12-08 17:51:36 +01:00
Laurent Destailleur
ea687b4957
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-08 00:30:42 +01:00
Laurent Destailleur
d9e5a597e4
Fixed: Avoid wrapping of help text
2014-12-08 00:29:33 +01:00
Laurent Destailleur
6ddae270b9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 23:52:02 +01:00
Laurent Destailleur
634a9d8402
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2014-12-07 19:19:48 +01:00
Laurent Destailleur
c35018be5f
Fixed: Translations
2014-12-07 18:24:45 +01:00
Laurent Destailleur
a4a7489a54
Fix: Missing the hook init
2014-12-07 15:12:32 +01:00
Laurent Destailleur
ceba894d57
Start to work on new generation combo box.
2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
Frédéric FRANCE
a8386b48e5
Update index.php
2014-12-02 19:53:54 +01:00
Frédéric FRANCE
222c275378
Update index.php
2014-11-30 23:04:01 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
9ba5e9434d
Fix: W3C a label must be used if there is an "input" field only. Also it
...
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
2014-11-28 02:05:40 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
ef991e6c5d
HTML5 - <center> is deprecated - Need CSS - continue working
2014-11-24 06:43:15 +01:00
Laurent Destailleur
bc1d88d324
Fixed: The visualization of status with mutualized picto was lost, so i
...
restore old feature to keep same visual for all status and add hidden
option to switch to new.
2014-11-24 01:16:26 +01:00
Frédéric FRANCE
64497de4d8
Update /societe/societe.php
2014-11-23 17:44:04 +01:00
Frédéric FRANCE
62876cc022
Update /societe/consumption.php
2014-11-23 17:44:01 +01:00
Frédéric FRANCE
5b0b222772
Update /societe/societe.php
2014-11-23 09:48:13 +01:00
Frédéric FRANCE
fbee671db1
Update /societe/consumption.php
2014-11-23 09:47:19 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
e3a8041b0d
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
ad661256c0
Fix: Bugs reported by scrutinizer
2014-11-15 16:20:03 +01:00
Laurent Destailleur
608fa5eaed
Fix: Avoid to load language when we can not.
2014-11-12 10:25:56 +01:00
Laurent Destailleur
92cdef71e8
Fix: Graph report rubbish information. Better to have them as option.
2014-11-08 14:58:43 +01:00
Juanjo Menent
6f9d283ddc
Fix: Module notifications DB Error "unknown field type" into third tab
...
notifications
2014-11-06 11:20:47 +01:00
Laurent Destailleur
0a0dd81c9a
Fix: When selecting a carbon copy fro select list, mail was not attached
...
to user.
2014-11-04 13:54:18 +01:00
Laurent Destailleur
b2ed53b785
Fix: Switch company/individual
2014-11-03 15:47:33 +01:00
Laurent Destailleur
a1a10edc30
Merge pull request #1987 from IonAgorria/soap-client-order
...
Added SOAP client for creating a client order in remote webservice
2014-11-01 21:14:19 +01:00
Ion Agorria
82aa8458bf
Added ws url/key to thirdparty SQL table, class and info page
2014-10-31 17:46:11 +01:00
Laurent Destailleur
4226c27ccf
Merge pull request #1965 from frederic34/patch-4
...
On/Off for Object (do not restrict to product)
2014-10-30 18:21:50 +01:00
Laurent Destailleur
9d9a1e0701
Merge pull request #1974 from grandoc/develop
...
encrease name length for societe
2014-10-30 18:04:38 +01:00
Maxime Kohlhaas
7b7b7e79e9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols
...
Conflicts:
htdocs/core/lib/company.lib.php
2014-10-27 11:17:44 +01:00
Maxime Kohlhaas
42008fcf98
Fix : remove associated users when company is deleted
2014-10-27 10:22:21 +01:00
Laurent Destailleur
a1a03a8061
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 00:42:52 +02:00
Philippe GRAND
19e194dd81
encrease name length for societe
2014-10-23 12:01:15 +02:00
Laurent Destailleur
d267a788d0
Fix: use getpost
2014-10-21 20:02:16 +02:00
Frédéric FRANCE
a14d07930a
Update soc.php
2014-10-18 22:52:54 +02:00
Laurent Destailleur
58b15fa736
Fix: Solve some regressions
2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b
Fix: Restore comaptibility with all languages.
...
Fix: Corrupting data function.
2014-10-18 00:41:21 +02:00
Laurent Destailleur
f49f9e24b7
Removed useless log and removed REQUEST.
2014-10-18 00:34:08 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Laurent Destailleur
f08759a17e
Fix: area to generate doc must use half size not onethird.
...
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
2014-10-12 11:59:52 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
166853dd56
Fix: miscellaneous bugs
2014-10-03 12:15:21 +02:00
Laurent Destailleur
cd4c81d15d
Uniformize code.
2014-09-28 16:31:37 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Raphaël Doursenaud
7c7276b5aa
FIX: Removed undeclared variable
2014-09-19 03:05:20 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
aspangaro
7a9ce455d9
Uniformize code $_SERVER["PHP_SELF"]
2014-09-18 20:13:38 +02:00
Laurent Destailleur
47d423aae4
Fix: Minor fix into intervention card
2014-09-18 00:21:25 +02:00
Drosis Nikos
a41dc3acd9
Correct view greek language
2014-09-17 18:06:31 +03:00
Juanjo Menent
d1879c1b9f
Qual: Remove unused code
2014-09-16 11:19:22 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
0d6d064e7e
New: PDF event report show project and status of event
...
Fix: Can edit description of intervention
New: Show status of object on refere page.
2014-09-15 12:48:24 +02:00
Laurent Destailleur
a0543d1752
Fix: No picto if no data
2014-09-15 09:59:08 +02:00
Laurent Destailleur
6f718af1b6
Fix: list of interventions of thirdparties
2014-09-15 09:29:40 +02:00
Laurent Destailleur
14889f0c11
Fix conflict
2014-09-15 08:53:43 +02:00
Marcos García de La Fuente
afd631e6e3
[ bug #1577 ] When creating new Private individual third, selected third type is ignored
2014-09-14 13:22:05 +02:00
Laurent Destailleur
aa2fc8605c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/societe/consumption.php
2014-09-11 17:13:24 +02:00
Laurent Destailleur
1785943580
New: List of interventions of thirdparties visibles into the referer
...
page of thirdparties.
2014-09-11 17:11:16 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
e4bff59f1a
Fix: pgsql compatibility. No upper cas into field names.
2014-09-04 20:17:25 +02:00
Laurent Destailleur
b1b69336ae
New: Add proposals into referer page of thirdparty
2014-09-03 18:48:42 +02:00
Laurent Destailleur
165856656a
Fix: balance with td
2014-09-02 19:45:50 +02:00
Laurent Destailleur
6e54577167
Better error management
2014-08-31 15:09:10 +02:00
Laurent Destailleur
f392eb4c94
Merge pull request #1803 from defrance69/patch-15
...
add company contact tabs
2014-08-17 01:05:18 +02:00
Laurent Destailleur
2eb01cfbf9
Squelette plus complet.
2014-08-15 21:18:56 +02:00
Laurent Destailleur
6b26ae6f1f
Fix: Header of tables must use th and not td
2014-08-14 13:30:44 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
e0a874b5fd
Merge pull request #1808 from KreizIT/GETPost_review
...
Add improvement to GETPOST function
2014-08-13 23:44:58 +02:00
Laurent Destailleur
98f140962a
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-13 19:23:45 +02:00
Laurent Destailleur
723bad0ece
Fix: colspan
2014-08-11 18:22:00 +02:00
Laurent Destailleur
bb355ec7bd
Fix: Do not force size. Must be done by function or css.
2014-08-11 18:06:23 +02:00
Laurent Destailleur
8630f397bc
Fix: Do not force size. Must be done by function or css.
2014-08-11 18:02:17 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
KreizIT
c94c0699d8
Fix : [ bug #1549 ] Itïs not possible add ExtraFields
2014-08-06 17:38:44 +02:00
KreizIT
cfe35f32e8
- Add improvement to GETPOST function
...
- Review thirdparty cards for illustration of new GETPOST functionality
2014-08-06 15:59:36 +02:00
Laurent Destailleur
e77be9e529
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-06 00:15:14 +02:00
Laurent Destailleur
5027222c33
Fix: When there is an error to update a thirdparty, the number for
...
supplier and customer code is kept to old value.
2014-08-05 18:28:06 +02:00
Laurent Destailleur
ee3f92a168
Fix: When there is an error to update a thirdparty, the number for
...
supplier and customer code is kept to old value.
2014-08-05 18:22:01 +02:00
Laurent Destailleur
9436b1d046
New: Prepare to be able to defined a bcc for each type of email sent
...
from dolibarr.
2014-08-05 09:26:40 +02:00
BENKE Charles
bc478a75ee
Update societecontact.php
2014-08-02 11:34:29 +02:00
BENKE Charles
21168308af
Update societecontact.php
2014-08-02 10:53:19 +02:00
BENKE Charles
f4738dc1d4
Update societecontact.php
2014-08-02 10:21:00 +02:00
BENKE Charles
83b27c33d8
add contact tabs on company
...
appair only if MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES is enabled
display on tabs adherent list of company
2014-08-02 10:03:53 +02:00
Laurent Destailleur
f58da0fa73
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/langs/fr_FR/main.lang
2014-08-01 02:05:38 +02:00
BENKE Charles
fb4e64fdab
Update consumption.php
...
security access fix : we don't have right to access of invoice and order if we are not agreed
2014-07-29 11:28:46 +02:00
Laurent Destailleur
d7163fe543
Qual: Start to fight deprecated code use reported by
...
https://scrutinizer-ci.com/g/eldy/dolibarr/issues/develop?orderField=path&order=asc
2014-07-20 15:34:33 +02:00
Laurent Destailleur
cfc337a79a
Qual: Enable php checkstyle rule Zend.Files.ClosingTag
...
Fix: Solve a lot of checkstyle errors.
2014-07-20 15:27:38 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Laurent Destailleur
6a19cc614a
Merge pull request #1737 from GPCsolutions/accessibility
...
Accessibility
2014-07-16 15:15:03 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
f1853c435b
More labels and autofocus for thirdparty and contact forms
2014-07-12 12:04:39 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
Raphaël Doursenaud
1ab938895b
Added autofocus to name on company creation
2014-07-11 20:05:45 +02:00
Raphaël Doursenaud
8a3fbf9533
Mutualized common code
2014-07-11 20:04:40 +02:00
Raphaël Doursenaud
78ce6c0b1c
Added labels on form elements for company creation
2014-07-11 19:57:51 +02:00
KreizIT
2d8fee8adb
Refactor: COMPANY_* trigger
2014-07-11 16:09:07 +02:00
Raphaël Doursenaud
f6848e8655
Add label on search boxes
2014-07-11 13:26:02 +02:00
Laurent Destailleur
3ea52a7967
Reduce memory print of object thirdparty.
2014-07-04 14:25:08 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Juanjo Menent
4c7eba0ee0
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with thirds
2014-07-03 18:47:06 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
ffd27f2d49
Fix: Translation
...
Fix: pgsql pb
2014-06-25 08:52:57 +02:00
Maxime Kohlhaas
46e54ac64e
Fix 1455 outstanding amount
2014-06-20 10:53:56 +02:00
Maxime Kohlhaas
aaabf9647d
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix)
2014-06-20 09:33:25 +02:00
Florian HENRY
9bb537f399
- New: If multilangue is enabled, mail (from propal, invoice, etc...)
...
message is pre-defaulted in Customer language
2014-06-18 09:59:15 +02:00
Maxime Kohlhaas
a3e278993e
Fix 1455 outstanding amount
2014-06-14 23:34:19 +02:00
Maxime Kohlhaas
bada082b2b
Fix 1462, 1468 $this instead of $object
2014-06-14 12:02:07 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
fa1af990d2
Third party module configuration: cosmetic change
...
Align the button on the right
2014-05-19 14:33:39 +02:00
Florian HENRY
fb277bbbab
fix llx_societe.datea call in request
2014-05-13 19:32:04 +02:00
Laurent Destailleur
64f8dcf131
Fix: Bad syntax of vars
2014-05-12 12:10:52 +02:00
Laurent Destailleur
8428caf8fb
List cleaner
2014-05-11 21:59:35 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Marcos García de La Fuente
ae28727fea
Improving documentation of Societe class
2014-05-05 12:53:46 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51
New: The combo list of juridical status is now sorted
2014-05-04 23:46:36 +02:00
Laurent Destailleur
93393db991
Merge pull request #1539 from defrance69/patch-7
...
Update index.php
2014-05-04 19:15:21 +02:00
Laurent Destailleur
9ebcec5b4e
Fix: duplicate declaration of property
2014-05-04 19:07:30 +02:00
Laurent Destailleur
c2c0a9b4bb
Merge pull request #1568 from GPCsolutions/closingtagremoval
...
Qual: Remove the closing PHP tag
2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf
Merge pull request #1567 from marcosgdf/doc
...
Improved documentation of Societe and started type hinting variables
2014-05-04 18:07:08 +02:00
Laurent Destailleur
c9ebe7729f
Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1371
Conflicts:
ChangeLog
2014-05-04 17:56:24 +02:00
BENKE Charles
a090333dbd
Update index.php
...
if nb of categories > 10 we add "other" on the pie charts
2014-05-04 17:50:31 +02:00
Laurent Destailleur
4e590e0c5e
Merge pull request #1564 from marcosgdf/minor
...
Fixed problem with non existing variable $db and removed not used variab...
2014-05-04 17:46:18 +02:00
Laurent Destailleur
bc35728ea3
Merge pull request #1562 from marcosgdf/translation
...
Improved translations
2014-05-04 17:39:36 +02:00
Laurent Destailleur
1fc25abf25
Fix: checkstyle on deprecated tag.
2014-05-04 17:31:23 +02:00
Laurent Destailleur
4d783b3934
Qual: Mark class as deprecated
2014-05-04 17:00:37 +02:00
Laurent Destailleur
d25778f12b
Qual: Removed duplicate column "datea" into table llx_societe
...
(duplicated with column tms).
2014-05-04 16:59:13 +02:00
Marcos García de La Fuente
862a8626f9
Documenting variables
2014-05-04 11:31:05 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
08301e3478
Corrected little bug when no state_id was defined
2014-05-03 17:16:37 +02:00
Marcos García de La Fuente
85c605449e
Defined missing used variables of the class and removed unused local vars
2014-05-03 13:45:20 +02:00
Marcos García de La Fuente
eb57d729a3
Typehinting $user variable
2014-05-03 13:23:45 +02:00
Marcos García de La Fuente
4cf3857aa4
Improved documentation of Societe and started type hinting variables
2014-05-03 13:19:03 +02:00
Marcos García de La Fuente
21c416805a
Moved the info about hidden constants DONOTSEARCH_ANYWHERE to a tooltip
2014-05-03 12:57:12 +02:00
Laurent Destailleur
c02fbcf293
Clean code.
2014-05-03 02:57:46 +02:00
Marcos García de La Fuente
4599b22cb5
Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents
2014-05-02 17:15:56 +02:00
Marcos García de La Fuente
af45ee1bc3
Fixed problem with non existing variable $db and removed not used variable $conf
2014-05-02 16:51:25 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
BENKE Charles
f05643116a
Update index.php
2014-04-20 14:22:27 +02:00
BENKE Charles
758b732391
Update index.php
...
add piechart on society categories
2014-04-20 12:04:42 +02:00
Laurent Destailleur
ce34c01b9e
New: On page to enter supplier prices, if there is no supplier, add
...
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
2014-04-16 00:06:16 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
c57c3aef84
Fix: Missing return
2014-04-05 16:28:09 +02:00
Laurent Destailleur
76259a633c
Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have
...
to do it everywhere at different places. Value is now 0 or 1.
2014-03-31 02:16:49 +02:00
Laurent Destailleur
2d3c700a7d
Fix: When cloning product, autogenerating barcode must not use same
...
number.
Qual: Moved dedicated permission of module to "advance" permissions.
2014-03-16 17:37:54 +01:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
6cec011df6
New: Add manager name (ceo, director, president...) into main company
...
information page.
2014-03-13 12:22:53 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Peter Fontaine
8ec10f8efa
Add state_id in contact for individual third party
2014-02-24 21:20:06 +01:00
Florian Henry
d242f4930d
php codesniffer
2014-02-23 17:01:51 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
Laurent Destailleur
5a29b3d546
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916
Fix: Bad space in predefined messages.
...
Fix: Signature was not added for email sent from thirdparty page.
2014-02-19 15:33:04 +01:00
Laurent Destailleur
2e67bbc382
Maxi debug of barcode feature.
...
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
2014-02-19 01:51:19 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
fdfb7f1a8a
Fix: Be sure there is no duplicate default rib.
2014-02-08 03:24:48 +01:00
Laurent Destailleur
cfb9150e10
Qual: Removed a hook that is a duplicate of trigger (CRUD event must be
...
enhanced by triggers, not hook).
Qual: Delete trigger must be done BEFORE delete of object, not after.
2014-02-06 20:35:11 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
efcff80a28
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
Laurent Destailleur
28b252849f
Fix: W3C
2014-01-31 13:02:48 +01:00
Laurent Destailleur
ebd8d5f8dd
New: Can input barcode during product creation step.
2014-01-28 19:11:22 +01:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
0a372a1c7d
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-21 13:26:05 +01:00
Peter Fontaine
919a7cd4a6
Fix: add civilite_id field in contact when create new third party.
2014-01-19 14:21:11 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
b61ccb8234
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:15:07 +01:00
Laurent Destailleur
5f65b2a97f
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-12 20:23:24 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Cédric Salvador
e959568a1d
Added details to the contact created by create_individual
2014-01-09 09:10:50 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
0e3184c436
Fix: W3C.
...
Fix: Permission on a button.
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/soc.php
Fix: Some menu entry not visible.
2014-01-06 17:17:57 +01:00
Laurent Destailleur
555170e573
Fix: W3C.
...
Fix: Permission on a button.
Fix: Some menu entry not visible.
2014-01-06 17:14:13 +01:00
Laurent Destailleur
48973c6d02
Fix: Some SQL requests were not finished into new tab "consumption".
2014-01-05 16:00:45 +01:00
Laurent Destailleur
9a6f22a86e
Fix: W3C no form into table.
...
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
67220a15ca
Fix: Bad translation key
2014-01-05 14:13:40 +01:00
simnandez
9f020bb0a9
Fix: Ordering
2013-12-30 18:24:33 +01:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Laurent Destailleur
76e4ba06a4
Fix: Calulcation of oustanding amount must not include abandonned
...
invoices.
2013-12-25 17:36:37 +01:00
Laurent Destailleur
aad7d32f7d
Merge pull request #1354 from csalvador/webservices-debug
...
Webservices debug
2013-12-23 02:20:15 -08:00
Laurent Destailleur
d9c7dc8697
Fix: Add protection to not delete a root directory when deleting a
...
company.
2013-12-21 12:04:39 +01:00
Cédric Salvador
18b163c6db
allow the webservice to create a private individual
2013-12-20 17:03:24 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
0e25939373
Fix: price function not correctly used
2013-12-14 17:40:23 +01:00
Laurent Destailleur
ed40e6d9b0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/langs/en_US/bills.lang
2013-12-14 15:44:10 +01:00
Laurent Destailleur
7ecb313798
Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers
2013-12-14 15:26:22 +01:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +01:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
24ce511671
Fix: [ bug #1167 ] Supplier IBAN account number set but no account
...
specified warning
2013-12-04 18:20:58 +01:00
Laurent Destailleur
a3372a9a0a
Fix: Regression
2013-12-02 22:14:47 +01:00
Laurent Destailleur
38e695b960
Look: Better support for jmobile
2013-12-02 07:38:37 +01:00
Laurent Destailleur
6c26684284
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:17:16 +01:00
Laurent Destailleur
c475346248
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:16:18 +01:00
Laurent Destailleur
84e3457023
Fix: [ bug #1161 ] Search on product label
2013-12-01 16:30:35 +01:00
Laurent Destailleur
25f49b6a24
Fix: bad test
2013-12-01 15:29:07 +01:00
Laurent Destailleur
abec634960
Look: Better support for jmobile
2013-11-30 02:31:17 +01:00
Laurent Destailleur
b71406f12d
Merge pull request #1322 from aspangaro/develop
...
Improvement of the Skype button
2013-11-26 07:29:37 -08:00
aspangaro
e1b4d01235
Improvement of the Skype button
...
Perm & add a button"Chat"
2013-11-24 21:28:15 +01:00
Laurent Destailleur
73408479ba
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-24 13:19:41 +01:00
Laurent Destailleur
8e313ef32d
Fix: Can add ban record but was not possible to delete
2013-11-23 16:17:20 +01:00
Laurent Destailleur
628e8bea83
Fix: Missing error message when files were too large.
2013-11-23 15:22:27 +01:00
Laurent Destailleur
6ffdc039a2
Fix: When option is not set, it must not appears as set.
2013-11-23 14:51:49 +01:00
Laurent Destailleur
20e6ca74c7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-22 18:25:08 +01:00
simnandez
5d34953200
New: Add list of orders products in tab "consumption" on thirdparties.
2013-11-22 14:30:29 +01:00
Laurent Destailleur
224abc3831
Fix: When option is not set, it must not appears as set.
2013-11-22 13:18:01 +01:00
Regis Houssin
f305524e29
Revert "Qual: Removed not used file"
...
This reverts commit 603c2aa938
2013-11-20 09:34:54 +01:00
Laurent Destailleur
d209d931e4
Doxygen
2013-11-18 00:29:11 +01:00
Laurent Destailleur
afa5bdb837
Fix: phpunit error
2013-11-18 00:12:13 +01:00
Laurent Destailleur
d28eacebd7
Fix: Remove an edit button that is not implemented.
2013-11-16 14:53:08 +01:00
Laurent Destailleur
8ec50fce23
Move warning at correct place.
...
Fix: Reset of amount was not working
2013-11-16 14:26:42 +01:00
Laurent Destailleur
d0d9cce146
Fix: price should not be used to compare amounts. Price is a formated
...
string, not an amount.
2013-11-15 22:15:48 +01:00
Laurent Destailleur
1e008ede3c
Merge pull request #1298 from Pfontaine/features/multi_rib
...
Features/multi rib
2013-11-15 06:27:58 -08:00
Laurent Destailleur
c324f6a9a3
Merge pull request #1295 from FHenry/develop
...
Display customer code (according setting) into list
2013-11-15 05:05:36 -08:00
aspangaro
8050f8e9fe
Fix problem field
2013-11-14 21:40:30 +01:00
Peter Fontaine
5a1df20c80
fix contact creation
2013-11-14 17:16:27 +01:00
Peter Fontaine
844531e1d2
missing param phpdoc
2013-11-13 16:20:52 +01:00
Peter Fontaine
b965103fc3
Multiple Bank Account Number for Third Party
2013-11-13 15:40:17 +01:00
Florian Henry
a73275b9c1
Add prospect code client into prospect list
2013-11-13 13:17:32 +01:00
Florian Henry
a76d5f8a1d
Fix getNomURL societe
2013-11-11 16:29:35 +01:00
Florian Henry
d04f5c3148
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-11 16:24:10 +01:00
Florian Henry
53f01685e3
Display customer code (according setting) into list
2013-11-11 16:23:11 +01:00
BENKE Charles
150118245f
Update societe.class.php
...
wrong name of outstandingbill function
2013-11-08 13:58:48 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
b74cfaf792
factorization
2013-11-06 10:19:17 +01:00
Cédric Salvador
3529f5238b
display links
2013-11-06 10:17:18 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
2d7181553b
Fix: translation
2013-11-05 15:29:58 +01:00
Laurent Destailleur
b18e125143
Merge pull request #1279 from aspangaro/skype
...
Task 157 : add a Skype button
2013-11-05 05:33:33 -08:00
Laurent Destailleur
2f47b0fcfd
Fix: picto for status8 is a flash red icon to report a critical error
...
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
2013-11-04 23:56:15 +01:00
aspangaro
76263213ab
Merge branch 'origin/develop'
2013-11-04 22:04:36 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Florian Henry
b52b49cbb0
USe good icons for customer status
2013-11-02 02:42:44 +01:00
Florian Henry
662f48ddc2
Use good icons
2013-11-02 02:21:45 +01:00
Florian Henry
399093f501
USe good status icon for thirdparty ActivityCeased
2013-11-01 13:48:22 +01:00
Florian Henry
7db319975f
Use good icon for status caesed societe
2013-11-01 13:47:17 +01:00
Florian Henry
f512ef344a
Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
...
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
953f638cb4
New: Sort combo list for type of thirdparties.
2013-10-28 02:13:07 +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
059b1fafb8
Fix: Missing translation
2013-10-25 09:47:17 +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
Florian Henry
e1dbee651e
restrict acces to commercialupdate if user can only see his own
...
thirdparty
2013-10-19 22:08:42 +02:00
Laurent Destailleur
2f1340a6c6
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2013-10-18 12:19:12 +02:00
Laurent Destailleur
9bc0f54ae8
Fix: set of country
2013-10-15 20:51:44 +02:00
Laurent Destailleur
603c2aa938
Qual: Removed not used file
2013-10-08 21:35:44 +02:00
Laurent Destailleur
c235c4e4ba
Fix: security sql injection
2013-10-07 22:50:27 +02:00
Laurent Destailleur
3f94af792b
Fix: security sql injection
2013-10-07 22:49:33 +02:00
BENKE Charles
2360dc52dd
Update societe.class.php
2013-10-06 17:21:10 +02:00
BENKE Charles
7828219787
Update societe.class.php
2013-10-06 17:19:18 +02:00
BENKE Charles
f52e9812fa
Update societe.class.php
2013-09-27 22:12:12 +02:00
Laurent Destailleur
470ccba80a
Qual: Fix two awful code with hardcoded values. This remove also 2 TODO.
2013-09-26 15:41:04 +02:00
Laurent Destailleur
db7bcfd748
Fix: Sending email from thirdparty must add event into agenda if option
...
is on.
2013-09-25 21:36:40 +02:00
Laurent Destailleur
065c87d81c
Qual: uniformize code: property ->tel on objects is now ->phone
...
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
6b2966794a
Do not show free text for thirdparty email send form
2013-09-23 14:35:22 +02:00
Laurent Destailleur
9189bdfa01
Fix: bad translation
2013-09-23 13:28:26 +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
cb04b05e85
New: Can send an email from thirdparty card.
2013-09-23 13:17:31 +02:00
Laurent Destailleur
5341811ec0
Fix: Clean awful code
2013-09-23 12:31:10 +02:00
Laurent Destailleur
7ed5d5e543
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-23 11:25:06 +02:00
Laurent Destailleur
dd0612099c
Qual: Uniformize fields departement_id into state_id
2013-09-20 14:35:58 +02:00
Cédric Salvador
e0295cefc1
get thirdparty's contacts as Contact objects
2013-09-20 10:38:17 +02:00
Laurent Destailleur
d03714d6d6
Fix: select
2013-09-18 23:29:21 +02:00
Laurent Destailleur
369eabc69e
Fix: bad condition
...
Conflicts:
htdocs/societe/societe.php
2013-09-18 23:26:35 +02:00
Laurent Destailleur
1810433a93
Fix: bad condition
2013-09-18 23:24:09 +02:00
simnandez
f7299f1a28
[ task #1063 ] Allow edit localtaxes rate for thirds
2013-09-17 18:06:06 +02:00
simnandez
c0b57fccaf
[ task #1063 ] Allow edit localtaxes rate for thirds
2013-09-17 17:43:14 +02:00
simnandez
7f21e596dd
[ task #1063 ] Allow edit localtaxes rate for thirds. Init Works
2013-09-17 17:17:59 +02:00
BENKE Charles
4a2ef0810d
Update societe.class.php
2013-09-17 10:33:47 +02:00
Laurent Destailleur
921777449f
New: [ task #90 ] Barcode search
2013-09-16 17:10:49 +02:00
Laurent Destailleur
01fb596555
New: [ task #90 ] Barcode search
2013-09-16 14:29:17 +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
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Raphaël Doursenaud
cd684460ff
Removed silly code
2013-09-05 17:30:17 +02:00
Laurent Destailleur
5d27ce0173
Merge pull request #1213 from open-minds/develop
...
Fix owner address of company bank account
2013-09-04 01:48:00 -07:00
Laurent Léonard
ec86efaab2
Fix owner address of company bank account
2013-09-03 23:57:36 +02:00
Laurent Destailleur
b150e03b06
Fix: bad merge.
...
Fix: Restore backward compatibility. Add option hideifdisabled for call
that does not need disabled users.
2013-09-02 00:47:30 +02:00
Laurent Destailleur
1ba382d7a6
Merge pull request #1202 from FHenry/develop
...
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Florian Henry
9ed5653ae5
[ task #1044 ] Add option to enabled thirdparty number into select
...
thirdparty list
2013-08-30 18:18:58 +02:00
lalaina rasamoelina
fcd6985196
T966-develop : Put the poste of the contact in the list
...
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
2013-08-29 10:32:28 +02:00
lalaina rasamoelina
8a4041e534
T975-develop Add an element (statut) in the table llx_socpeople
...
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373
Style of page
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178
Delete the contact who are gone,in the email list
2013-08-22 11:04:06 +02:00
Florian Henry
d7d3aeff8f
Fix canvas feature broken
2013-08-14 09:56:43 +02:00
Florian Henry
6cb274e25e
Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
2013-08-14 09:56:30 +02:00
Florian Henry
d6c7ac5f73
Fix canvas feature broken
2013-08-13 09:16:39 +02:00
Florian Henry
da565b2c7f
Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
2013-08-12 19:43:51 +02:00
Laurent Destailleur
3a209afa94
Update societe.class.php
...
Add missing space
2013-08-08 01:54:08 +02:00
Laurent Destailleur
bf95cf40d9
Merge pull request #1164 from PaulPoulain/966-develop
...
T966-develop : Put the poste of the contact in the list
2013-08-07 16:51:27 -07:00
lalaina rasamoelina
c0d3ed0d60
T966-develop : Put the poste of the contact in the list
...
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
2013-08-07 10:17:18 +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
Cédric Salvador
69d6b6f348
print hooks results in thirdparty/contact cards
2013-08-01 16:02:37 +02:00
Laurent Destailleur
ba2c6d4d54
Fix: Confirm boxes with jmobile
2013-08-01 05:13:13 +02:00
Laurent Destailleur
53672dff75
Fix: Confirm boxes with jmobile
2013-08-01 04:20:08 +02:00
Maxime Kohlhaas
dae36229a4
Task # 1011 : add payment terms and payment mode on supplier card
2013-07-30 15:06:57 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Maxime Kohlhaas
ac205aac2d
Add search on siren (idprof1)
2013-06-24 10:05:29 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
2a014f8c7c
Merge pull request #1057 from marcosgdf/develop
...
CR Fix
2013-06-19 09:31:28 -07:00
Laurent Destailleur
09317e2034
Fix: Pb with firstname/lastname and font size
2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779
Fix: Pb with firstname/lastname and font size
2013-06-19 18:08:05 +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
326387ab75
Fix: Missing lang
2013-06-17 15:00:40 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
91068a4476
Fix: Pb into form output
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-06-16 20:16:05 +02:00
Laurent Destailleur
0690e8c39e
Fix: Pb into form output
2013-06-16 20:08:45 +02:00
Laurent Destailleur
2005f0ba81
Merge pull request #1047 from PaulPoulain/929
...
929
2013-06-15 12:55:23 -07:00
lalaina rasamoelina
8139e6e5f0
T929 put the button to remove filter in company list
2013-06-14 14:56:49 +02:00
lalaina rasamoelina
57c4d7212d
T929 Printed all the name that have been cut to 30 char
2013-06-14 14:56:04 +02:00
Laurent Destailleur
7e53f98baa
Qual: Uniformize code
2013-06-05 22:01:35 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
c6411477d7
Clean dead comments
2013-06-01 15:36:37 +02:00
Laurent Destailleur
aa42531e20
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-30 23:53:41 +02:00
Laurent Destailleur
e6bca3c549
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-29 22:42:48 +02:00
Laurent Destailleur
7413e33599
Fix: Bad page code
2013-05-29 22:41:57 +02:00
Laurent Destailleur
4fa99a86ed
Fix: Bad permissions
2013-05-29 21:18:21 +02:00
Laurent Destailleur
60498f2692
Fix: Bad permissions
2013-05-29 13:31:57 +02:00
Laurent Destailleur
2a96172294
Fix: Pb in synchro update
2013-05-25 18:12:00 +02:00
Laurent Destailleur
f16026b79c
Fix: cyclic updates
2013-05-25 18:11:54 +02:00
Laurent Destailleur
99c657255e
Fix: Bug erase member data
2013-05-25 18:11:42 +02:00
Laurent Destailleur
44268903a0
Fix: Pb in synchro update
2013-05-25 18:01:50 +02:00
Laurent Destailleur
c36f8a0149
Fix: cyclic updates
2013-05-25 17:28:31 +02:00
Laurent Destailleur
06f6f48147
Fix: Bug erase member data
2013-05-25 17:14:56 +02:00
fhenry
faa2399b80
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
2013-05-17 09:49:06 +02:00
fhenry
f98442d700
Remove the option into admin screen
2013-05-14 09:24:05 +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
fhenry
a78b3149fe
Remove debug lines
2013-05-12 17:15:45 +02:00
fhenry
aa7e3c2fdd
[ task #892 ] Add option in thridparty customer/supplier admin to hide
...
non active in select_company method
2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
Marcos García
edfcfb9bbd
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
...
Conflicts:
htdocs/admin/commande.php
htdocs/admin/expedition.php
htdocs/admin/facture.php
htdocs/admin/fichinter.php
htdocs/admin/livraison.php
htdocs/admin/supplier_invoice.php
htdocs/admin/supplier_order.php
htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
Marcos García
3d5cb4e8de
Style improvements in model document selector
2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72
Corrected translations of info tooltips in document models description
2013-05-07 22:04:08 +02:00
Marcos García
0a90af0b99
Fixed untranslated string
2013-05-06 23:31:19 +02:00
Laurent Destailleur
fa497cf5fc
Fix: Trans and wrap
2013-05-02 18:25:27 +02:00
Laurent Destailleur
9a4cc839bb
Fix: Removed warning
...
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
2013-05-02 17:41:10 +02:00
Laurent Destailleur
cbc56f8044
Fix: W3C
...
Fix: Translation
2013-05-01 16:05:52 +02:00
Laurent Destailleur
b21a13b789
Fix: compatibility with jmobile
2013-04-28 20:29:21 +02:00
Laurent Destailleur
2e81fa342e
Uniformize code, order of fiels in card and language files.
2013-04-28 01:12:40 +02:00
Laurent Destailleur
757473cf86
Replace table with div
2013-04-28 00:36:49 +02:00
fhenry
91885a8bd4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0
Fix: Removed warnings
2013-04-26 19:13:39 +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
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Laurent Destailleur
3896b99bad
Add UK with GB.
2013-04-24 19:14:59 +02:00
Laurent Destailleur
d5f3f47782
New: Use div for tabs.
2013-04-24 03:56:13 +02:00
Laurent Destailleur
1f0adfaff5
Can remove an element from category when on category view.
2013-04-21 23:44:33 +02:00
Maxime Kohlhaas
129da11a52
Fix : consumption
2013-04-20 13:13:33 +02:00
Maxime Kohlhaas
571037d396
Fix : consumption on company
2013-04-20 13:09:26 +02:00
Laurent Destailleur
6860aa05c7
Fix: Missing test
2013-04-19 00:20:21 +02:00
Laurent Destailleur
bda39f25bf
New: Default aprrover for holidays i sby default hierchical parent.
2013-04-14 01:04:11 +02:00
Laurent Destailleur
4876aee493
Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON
2013-04-11 20:32:09 +02:00
Laurent Destailleur
3d8c312a30
Fix: Uniformize column size
...
Fix: Use dol_prind_address for addressees
2013-04-10 16:15:35 +02:00
Laurent Destailleur
4f645b0a53
Fix: Bad width
2013-04-10 16:08:38 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
Laurent Destailleur
af6f075b5c
Qual: Better error management.
...
Qual: Uniformize code for canvas
2013-04-09 23:56:52 +02:00
Laurent Destailleur
cf52cbfab5
Fix: Better error management
2013-04-09 23:46:38 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Laurent Destailleur
7d2b11aff5
Qual: Remove a deprecated page, replaced by a more direct combo box.
2013-04-08 19:26:45 +02:00
Laurent Destailleur
c6b66a9f4a
Normalize code
2013-04-08 17:42:24 +02:00
Laurent Destailleur
5c3e6de073
Qual: Mutualize code. Only one function to build address format.
2013-04-07 17:39:08 +02:00
Laurent Destailleur
f22b1d3678
Enhance specimens
2013-04-06 03:40:55 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
bf23efda21
Fix: Bad error management
2013-04-04 09:17:03 +02:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Laurent Destailleur
545ac638b0
Qual: Removed deprecated code for using a specific mobile theme.
...
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +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
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
jfefe
2b587e1742
For thirdparty use new method to display extrafield values
2013-03-30 18:54:51 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +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
jfefe
c1e6de33eb
Fix : bad definition of key for extrafields array
2013-03-29 14:37:29 +01:00
jfefe
76ce938f61
When retrieve extrafields, loop on extralabels array instead of posted values
...
Add support for calendar display on date extrafield
2013-03-29 14:09:47 +01:00
jfefe
013eac1147
Better error management when add/update extrafield
...
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
Laurent Destailleur
fbf8d410d2
New: Support revenue stamp onto invoices
2013-03-23 17:34:23 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
2da3fb68a0
Merge pull request #751 from jfefe/extrasep
...
New type of extrafield : separator
2013-03-16 07:41:34 -07:00
Laurent Destailleur
fcef334122
Merge pull request #748 from GPCsolutions/naturalsearch
...
Natural search
2013-03-16 07:38:55 -07:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01:00
jfefe
9a57431879
Show extrafield separator on thirdparty and contact
2013-03-16 00:28:45 +01:00
Raphaël Doursenaud
639c033afb
Added natural search to third parties
2013-03-15 15:37:59 +01:00
Raphaël Doursenaud
ea442d9351
Fixed use of deprecated data field
2013-03-15 15:37:11 +01:00
Laurent Destailleur
1df3ad143e
Fix: Lastname lost
2013-03-11 17:04:59 +01:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Grand Philippe
06e931632d
fix some translations
2013-03-11 14:51:48 +01:00
Grand Philippe
bb71b7ffed
fix some translations
2013-03-11 12:00:09 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
3e5ee3b00a
Fix: PHPUnit tests are back.
2013-03-09 18:55:57 +01:00
Laurent Destailleur
2c95b55682
Fix: Rename of fields
2013-03-09 16:37:50 +01:00
Laurent Destailleur
418eeef8b4
Fix: Ton of bugs into renaming fields
2013-03-09 16:19:15 +01:00
Laurent Destailleur
0fe91796ef
New: [ task #696 ] Remove "new stdClass();" when possible
2013-03-08 15:52:23 +01:00
Laurent Destailleur
47ec826c17
New: Add link to check professional id for india.
2013-03-07 10:47:05 +01:00
Grand Philippe
a080021511
fix : deprecated
2013-03-06 17:17:34 +01:00
Maxime Kohlhaas
803bee076c
Engish standardization correction + search by idprof1 possible
2013-03-01 18:20:42 +01:00
Alexis Algoud
49f712546f
Add condition for normal traitment on empty hook result.
...
Note : The normal case on 'formObjectOptions' is currently nothing more (no extrafields,...).
2013-03-01 11:38:24 +01:00
Alexis Algoud
2d36423310
Ajout de la gestion des Hooks (doActions & sur la page d'ajout des commerciaux à une société, /societe/commerciaux.php
2013-03-01 10:42:05 +01:00
Grand Philippe
44dee53350
english language standardization
2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847
english language standardization
2013-02-25 09:17:38 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
067cb0a409
some fix for english language standardization
2013-02-24 14:32:15 +01:00
Grand Philippe
36ce7a9a10
some fix for english language standardization
2013-02-24 14:11:09 +01:00
Grand Philippe
77544de01a
some fix for english language standardization
2013-02-24 12:50:05 +01:00
Grand Philippe
5d3ab26463
some fix for english language standardization
2013-02-24 12:26:01 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082
english language standardization
2013-02-23 17:01:10 +01:00
Grand Philippe
4f9f32eb3e
english language standardization
2013-02-23 16:37:17 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Grand Philippe
529b8ae38e
english standardization
2013-02-23 10:43:16 +01:00
Grand Philippe
9400d9897a
english standardization
2013-02-23 10:35:46 +01:00
eldy
4f1c4f0365
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-22 00:11:47 +01:00
eldy
2ecb113d30
Fix: categories are set onto category tab
2013-02-22 00:11: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
jfefe
2f4a80215b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
2013-02-18 13:39:00 +01:00
Laurent Destailleur
f82bec552b
Fix: Check id field are mandatory
2013-02-18 13:07:32 +01:00
Laurent Destailleur
fb845b3a37
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-18 13:02:13 +01:00
Laurent Destailleur
37e9b04d83
Fix: Check id field are mandatory
2013-02-18 12:57:14 +01:00
jfefe
bd2d9cdd3e
Split extrafields display into 2 columns (thirdparty)
2013-02-18 00:41:50 +01:00
jfefe
16e9f6db48
Fix : bad name of property when retrieve extrafields for thirdparty
2013-02-17 21:27:33 +01:00
jfefe
527beab671
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt
2013-02-17 21:26:56 +01:00
jfefe
4f5b636cc7
Fix : missing class file
2013-02-16 13:58:21 +01:00
jfefe
fa53147d0a
Retrieve extrafields when fetch thirparty
...
Work on extrafields support in thirpdparty ODT document
2013-02-16 03:41:11 +01:00
jfefe
3d8197ce4b
Work on extrafields : position management & new type : select list
2013-02-15 11:19:49 +01:00
fhenry
136dc651f3
Merge branch 'develop' into develop_merger_cust_prospect_tab
2013-02-12 19:18:15 +01:00
fhenry
82fc8e1536
Task 350 in Doliforge
2013-02-12 19:16:48 +01:00
fhenry
6ad617842d
Commit temporaire
2013-02-12 15:31:12 +01:00
fhenry
d8d4b669ab
Task [ task #711 ]
2013-02-12 09:49:27 +01:00
Laurent Destailleur
c42a0c5b03
Fix: removed warning
2013-01-28 14:40:15 +01:00
Regis Houssin
647cbb08fb
Fix: wrong EOL
2013-01-26 10:38:11 +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
Laurent Destailleur
a7d41d74e8
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 18:09:05 +01:00
Laurent Destailleur
ec76127625
Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers
...
Fix: Update member
2013-01-22 15:14:46 +01:00
Laurent Destailleur
3438b9fa62
Fix: init specimen
2013-01-18 12:32:10 +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
Laurent Destailleur
ec8b260bf6
New: Prepare 3.4 branch
...
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
6d036699bb
Qual: Uniformize usage of array module_parts.
2013-01-07 13:28:14 +01:00
simnandez
c0246c07b1
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-05 16:03:00 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
1d17d990bd
Fix: Patch from antar3s: Re: Filter on company type in modSociete
2012-12-20 17:42:23 +01:00
simnandez
614a8e48a2
Fix: Use transcountry instead trans for localtaxes label
2012-12-12 12:40:30 +01:00
Laurent Destailleur
f4459ee1f1
Fix: Regression detected by PHPUnit
2012-12-10 19:06:59 +01:00
fhenry
1d6bc23f4d
- Uniformize Extrafield deletion for adherent,user,product,societe by
...
using commonobject method
- Add convertion of tms timestamp special case in mysql for pgsql
2012-12-08 14:23:52 +01:00
Laurent Destailleur
2cfd8fbd64
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-05 21:32:49 +01:00
Laurent Destailleur
7250592d0c
Code comments
2012-12-05 21:32:18 +01:00
Regis Houssin
3d4621327c
Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
...
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Laurent Destailleur
d428549e15
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-02 13:51:52 +01:00
Laurent Destailleur
938dc92ab6
Qual: More complete error management into delete methods
2012-12-02 13:51:33 +01:00
Regis Houssin
00aa22e1d7
Fix: wrong EOL
2012-12-02 11:03:23 +01:00
Christophe Battarel
f0e75bf11a
dont use ES translation for labels
2012-12-02 10:52:04 +01:00
simnandez
c365dbc679
New: [ task #314 ] Can define if prof id are mandatory or not
2012-12-01 15:47:39 +01:00
simnandez
4f2f56fced
New: [ task #314 ] Can define if prof id are mandatory or not
2012-12-01 15:47:33 +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
Laurent Destailleur
d30b74e69e
Merge pull request #508 from simnandez/develop
...
Fix: Add to areas not working if we navigate with shownavref
2012-12-01 02:56:11 -08:00
simnandez
b4e16827dc
New: [ task #314 ] Can define if prof id are mandatory or not
2012-11-30 21:23:12 +01:00
simnandez
6487baa081
New: [ task #314 ] Can define if prof id are mandatory or not
2012-11-30 18:46:05 +01:00
simnandez
740810abca
Fix: Select of notifications events is showed in french
2012-11-28 18:35:00 +01:00
simnandez
5c86d21941
Fix: Select of notifications events is showed in french
2012-11-28 18:31:52 +01:00
Christophe Battarel
53cf2ca8f5
dont use ES translation for labels
2012-11-28 17:57:17 +01:00
Christophe Battarel
cee8e16e7e
correct wrong check for localtaxes
2012-11-28 09:32:41 +01:00
Christophe Battarel
e919ce893a
check if company has localtaxes for its country
2012-11-27 13:05:21 +01:00
Laurent Destailleur
3f64b533f4
Fix: [ bug #607 ] Nom de société avec guillemets
2012-11-26 16:06:50 +01:00
Laurent Destailleur
5f9cf28e45
New: Add option to choose if init of form is for a company third party
...
or an individual third party.
2012-11-15 16:26:05 +01:00
Regis Houssin
a0c478a0a2
Fix: strict mode cleaner
2012-11-13 12:32:05 +01:00
Laurent Destailleur
e7164cb243
Fix: Some checkstyle errors
2012-11-11 18:18:57 +01:00
Regis Houssin
2ecb9262e7
Fix: wrong access rights and remove unused code
2012-11-10 08:19:33 +01:00
Regis Houssin
57cce6f517
Fix: missing global
2012-11-09 19:34:05 +01:00
Regis Houssin
0e0582c16f
Fix: avoid conflicts with external module if triggers used
2012-11-09 19:23:46 +01:00
Regis Houssin
076fa17593
Fix: missing colspan value
2012-11-03 16:58:50 +01:00
Regis Houssin
a26ab0e8e1
Fix: add just colspan value
2012-11-03 16:51:41 +01:00
Laurent Destailleur
066bcbb469
Qual: Add dol_format_address PHPUnit tests
2012-10-31 01:45:48 +01:00
Christophe Battarel
eb4cf359ec
fix error in constant name for SOCIETE_CODEFOURNISSEUR_ADDON in get_codefournisseur()
2012-10-27 11:12:41 +02:00
Laurent Destailleur
cbff238cbd
New: Support property "required" for extra fields.
2012-10-25 16:23:58 +02:00
Marcos García
da94ec8fa4
Normalized thirdparties module card name
2012-10-16 01:36:42 +02:00
Laurent Destailleur
8ff506b120
Sec: Sanitize all params page, sortfield and sortorder
2012-10-13 14:47:46 +02:00
Regis Houssin
67f40fcd1e
Fix: works on security
2012-10-13 10:39:16 +02:00
Regis Houssin
62f170d3d7
Fix: add escape
2012-10-09 20:23:02 +02:00
Regis Houssin
edb6195cc2
Fix: add similitude test
2012-10-09 20:08:54 +02:00
Regis Houssin
925af263fc
Fix: best test
2012-10-09 18:54:21 +02:00
Regis Houssin
3abb1b88ff
Fix: best method
2012-10-09 18:33:02 +02:00
Regis Houssin
6791d23032
Fix: use asterisk for define the percentage
2012-10-09 18:21:12 +02:00
Regis Houssin
a20f7094ef
Fix: refactore
2012-10-09 18:11:51 +02:00
Regis Houssin
74dd4ce218
Fix: possibility to force the clause
2012-10-09 18:06:59 +02:00
Regis Houssin
337cb0faa5
Fix: add not exact method
2012-10-09 17:47:58 +02:00
Regis Houssin
7cde9ab668
New: add search method with case sensibility and filters
2012-10-09 15:49:42 +02:00
Regis Houssin
6b50219999
Fix: add function for build $mysoc object
2012-10-04 18:54:56 +02:00
Laurent Destailleur
9bbe0e6b1c
Qual: Mutuamize codeby using tpl.
...
New: Support unique field for extrafields
2012-09-22 20:27:06 +02:00
Regis Houssin
58ae3b9372
Fix: possibility to disable hook
2012-09-17 19:36:43 +02:00
Laurent Destailleur
3953be53a7
Qual: Mutualize code
...
New: Can use extrafields on contacts/addresses.
2012-09-17 01:39:30 +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
b33e59dd66
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-09-14 15:56:11 +02:00
Laurent Destailleur
e7d3d9496c
first step for extrafield for contact/address
2012-09-14 12:15:55 +02:00
Regis Houssin
3a6be2b896
Fix: uniformize code
...
fix: add current user for commercial by default
2012-09-14 11:34:30 +02:00
Regis Houssin
7eef637776
Fix: strict mode killer
2012-09-13 11:52:50 +02:00
Laurent Destailleur
4cc56f0176
New: Extra fields supports more types (now int, string, double, date,
...
datetime)
2012-09-13 10:14:25 +02:00
Regis Houssin
a663f8fb3b
Fix: remove obsolete code
2012-09-12 16:02:01 +02:00
Marcos García
85064abdad
Search thirds from barcode directly from the mini search box
...
Also added a check when generating barcode image
2012-09-11 14:27:41 +02:00
Laurent Destailleur
66af48697c
Doc
2012-09-10 10:25:47 +02:00
Raphaël Doursenaud
75647aa19d
Inverted the clause for commercial_id affectation
...
This permits using a script to import commercial_id.
The clause to automatically affect the current user as commercial doesn't seem to work anyway
2012-09-10 10:00:22 +02:00
Regis Houssin
a7bfc722d5
Fix: use specific variable
2012-09-09 16:31:00 +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
Regis Houssin
8a5fe809f4
Fix: remove deprecated function and avoid warnings
2012-09-02 22:31:25 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
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
Regis Houssin
3991e0b13d
Fix: add accountancy code error message
2012-08-20 01:29:13 +02:00
Regis Houssin
fbb275ee25
Fix: remove bad fixe
2012-08-15 09:15:26 +02:00
Regis Houssin
48efabc8a4
Fix: remove deprecated function and avoid warnings
2012-08-15 09:06:36 +02:00
Regis Houssin
e44fd4885d
Fix: change the last $DB to $db
2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Regis Houssin
28851b46c4
Fix: remove duplicate code
2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74
Fix: replace with new event message system
2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95
Fix: broken event message
2012-07-29 15:47:24 +02:00
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
