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 |
|
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 |
|
Marcos García de La Fuente
|
a41a80b8fe
|
Merge branch 'develop' into oop-refactor-bankaccount-tostring
|
2016-04-09 23:17:09 +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 |
|
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 |
|