lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,561 Commits 43 Branches 150 Tags 886 MiB
88356e2e97
Commit Graph

8533 Commits

Author SHA1 Message Date
Laurent Destailleur
bc29898621 Merge pull request #3814 from FHenry/3.8 
FIX : missing tag myuser_job into ODT replacement
 2015-11-02 11:22:52 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin 
Fix: #2591 Margin is incorrect used with POS
 2015-11-02 11:06:20 +01:00
Laurent Destailleur
465ad6b3a7 Merge pull request #3802 from olsesacl/develop-hook 
hooks correctly implemented , printObjectLine, printObjectSubLine
 2015-11-02 10:44:59 +01:00
Laurent Destailleur
37f01f995c Merge pull request #3853 from aspangaro/develop-71 
Salaries : Replace "label for" by the function fieldLabel & add some notes & correct typo
 2015-11-02 10:42:19 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option. 
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
 2015-11-02 10:09:09 +01:00
frederic34
3e752ed5c8 Typo 2015-11-02 09:46:21 +01:00
Laurent Destailleur
6fe43cbbeb Removed dead code 2015-11-02 09:08:08 +01:00
Laurent Destailleur
3409686405 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 08:57:01 +01:00
aspangaro
ac47c2f22e Merge remote-tracking branch 'Upstream/develop' into develop-71 2015-11-02 06:44:16 +01:00
aspangaro
6df524bcb0 Remove blank page 2015-11-01 22:54:04 +01:00
Regis Houssin
0fd7ba478a Fix: add Mac OS 2015-11-01 17:27:41 +01:00
frederic34
b9367bb196 Errors management 2015-11-01 11:24:51 +01:00
frederic34
2b4224d4c4 List Jobs 2015-11-01 10:10:14 +01:00
frederic34
2f3e6958f9 Receipt Printer 2015-11-01 00:58:08 +01:00
frederic34
bb06a55844 Work on list jobs 2015-10-31 23:27:10 +01:00
frederic34
0836a84c0e Somme cleaning 2015-10-31 18:06:49 +01:00
Marcos García de La Fuente
e1f2efee4d Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-31 11:46:14 +01:00
Juanjo Menent
efb6e87f3f Merge pull request #3839 from fmarcet/3.8 
FIX Bad parameter on calling get_exdir function
 2015-10-30 22:13:36 +01:00
Laurent Destailleur
6482a4ee04 Minor css fix 2015-10-30 20:04:03 +01:00
Laurent Destailleur
a8d28b5e46 NEW Add a filter field to restrict list of member when doing a LDAP list 
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
 2015-10-30 19:23:23 +01:00
frederic34
b6be372c4b Merge remote branch 'upstream/develop' into printgcp 2015-10-30 18:12:34 +01:00
frederic34
e90f68906e SQL tables for oauth 2015-10-30 17:59:45 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Ferran Marcet
5862037d34 FIX Bad parameters 2015-10-30 13:03:34 +01:00
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu 
manager.
 2015-10-30 09:36:57 +01:00
Laurent Destailleur
6cc3df7e71 NEW Quick searh filter works on invoice, proposal, order, intervention, 
contract
 2015-10-30 08:35:56 +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
Frédéric FRANCE
b1c4e032fc Update html.formfile.class.php 2015-10-29 19:08:38 +01:00
Frédéric FRANCE
e5063010b2 Update actions_printing.inc.php 2015-10-29 19:07:00 +01:00
Juanjo Menent
c14349f1ea Merge pull request #3829 from hregis/3.8_bug 
Fix: add missing hooks
 2015-10-29 16:05:35 +01:00
Regis Houssin
6373c82559 Fix: broken features !!! 2015-10-29 13:14:38 +01:00
fmarcet
310ecb1e09 FIX: Show product image on getNomUrl() 2015-10-29 12:28:28 +01:00
Regis Houssin
e5b1e214bc Fix: add missing hooks 2015-10-29 11:50:16 +01:00
fmarcet
62dc6814a3 FIX #3726 Not showing images on product card 2015-10-29 10:14:54 +01:00
Florian HENRY
9a95401473 FIX : add tag myuser_job into ODT replacement 2015-10-28 11:27:39 +01:00
Laurent Destailleur
87c240252c FIX Can export a field into task time table with export project profile 2015-10-27 22:24:18 +01:00
Laurent Destailleur
76ded0acea Fix using DATE_FORMAT is forbidden 2015-10-27 19:26:33 +01:00
fappels
8992cfaeb4 move require_once 2015-10-27 15:50:55 +01:00
Marcos García de La Fuente
eff1f73950 Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
#	htdocs/product/price.php
 2015-10-27 10:41:50 +01:00
Sergio Sanchis Climent
b1bc000bae standardize 2015-10-27 09:19:39 +01:00
Laurent Destailleur
4f04775b41 Merge pull request #3800 from olsesacl/develop 
error this.price > 0 always false
 2015-10-26 22:40:26 +01:00
fappels
4d839eea60 Fix #2591 Margin is incorrect used with POS 
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
 2015-10-26 20:33:42 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone 
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
 2015-10-26 16:20:09 +01:00
Sergio Sanchis Climent
990fbf3ef4 hooks correctly implemented , printObjectLine, printObjectSubLine 
In hook can change correctly label and ref (for my module need if is posible)
 2015-10-26 14:00:43 +01:00
Laurent Destailleur
5c4ac0bf62 NEW Merge all left menu search boxes into one. 2015-10-26 12:18:22 +01:00
Sergio Sanchis Climent
2696369470 Merge remote-tracking branch 'upstream/develop' into develop 2015-10-26 11:38:52 +01:00
Sergio Sanchis Climent
4fd0086862 Fix: error this.price > 0 
if no parse this.price when compare this.price and 0 always false
 2015-10-26 11:33:43 +01:00
Laurent Destailleur
71da059ef0 NEW Add a new widget $form->selectArrayAjax() to use combo list with 
content coming from an Ajax URL.
 2015-10-26 11:23:31 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
77a0359cfc Fix bad test 2015-10-25 20:17:43 +01:00
Laurent Destailleur
9a4b62c279 NEW Introduce use of cache for thumbs images of users 2015-10-25 20:15:52 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
4e206fa80b Fix doxygen 2015-10-25 19:53:59 +01:00
Laurent Destailleur
d7761ece58 FIX The thumb of user into top menu was using the image in full size. 
This make a large download at each page call. We must use the mini
thumbs.
 2015-10-25 19:42:54 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size. 
This make a large download at each page call. We must use the mini
thumbs.
 2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f NEW Show photo of user into user list. A new function 
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
 2015-10-25 19:31:42 +01:00
Laurent Destailleur
1b8234d9fe Bette behaviour for blind people 2015-10-25 11:09:50 +01:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +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
a01a85c3f6 FIX tag object_total_vat_x need x to be a string with unknown decimal 
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
 2015-10-23 15:13:02 +02:00
Laurent Destailleur
f6d30d8b9e Fix: W3C no form into table 2015-10-23 14:40:45 +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
90a221ef6d Fix version of module 2015-10-22 19:46:30 +02:00
Laurent Destailleur
633055fe5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 19:44:00 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
Laurent Destailleur
531ef43a27 Some minor look fixes. 2015-10-22 19:13:16 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
2615e02e1e Update doc 2015-10-22 13:18:51 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
Laurent Destailleur
ce681081c1 Merge pull request #3776 from frederic34/patch-15 
Set warehouse for order
 2015-10-22 12:16:40 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
Laurent Destailleur
8bdbed69c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2015-10-22 10:22:54 +02:00
Laurent Destailleur
81d4148f4a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 09:50:26 +02:00
Laurent Destailleur
474692e71a Remove duplicate page fourn/list.php 2015-10-22 09:48:16 +02:00
Laurent Destailleur
7daf9d10af Work on the new selectArrayAjax widget 2015-10-21 20:50:27 +02:00
Laurent Destailleur
fd72b4a400 Work on the new selectArrayAjax widget 2015-10-21 20:43:11 +02:00
BENKE Charlie
ec9955986f Update admin.lib.php 2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747 Update admin.lib.php 2015-10-21 05:06:19 +02:00
Laurent Destailleur
8306d93286 NEW Add css on column of detail lines to allow module to easily 
manipulate fields.
 2015-10-20 16:08:25 +02:00
Laurent Destailleur
f123e11c8e Doxygen 2015-10-20 12:53:32 +02:00
Laurent Destailleur
0c6441df74 FIX Using extrafield with type "Link to object" works correctly. 2015-10-20 12:40:37 +02:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00
Laurent Destailleur
b5e633ef42 Size too small 2015-10-20 00:52:53 +02:00
Laurent Destailleur
e70bb28be7 If firstname not define, use lastname 2015-10-20 00:47:35 +02:00
Laurent Destailleur
23d7d60d73 Better compatibility with old versions 2015-10-20 00:22:28 +02:00
Frédéric FRANCE
affe067ff1 Update commonobject.class.php 2015-10-19 21:09:02 +02:00
Maxime Kohlhaas
158281b14c Fix : minor typo 2015-10-19 17:13:02 +02:00
Marcos García de La Fuente
e7e152c122 NEW Level multiprice generator based on per cent variations over base price 2015-10-19 15:13:19 +02:00
Laurent Destailleur
bbbd5f5202 Fix removed var_dump 2015-10-19 14:55:01 +02:00
Laurent Destailleur
d71ccc4a02 NEW The free text in PDF footer can now be a HTML content. So the 
WYSIWYG editor is on by default to edit it into module setup.
 2015-10-19 14:39:55 +02:00
Laurent Destailleur
18725b554b Option MAIN_REPLACE_TRANS_xx_XX is now completely implemented. 2015-10-19 13:23:45 +02:00
Laurent Destailleur
fd3ba13130 FIX #3541 Bypass authentication when user was created using LDAP 2015-10-18 21:33:47 +02:00
Frédéric FRANCE
6f4cfc86e8 Update notify.class.php 
http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374
 2015-10-18 11:25:55 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
aspangaro
aac88519de Merge remote-tracking branch 'Upstream/develop' into develop-hrm 
Conflicts:
	htdocs/user/card.php
 2015-10-17 07:19:46 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +02:00
Laurent Destailleur
d1d6c72d7d NEW Uniformize way of working for search filters. One filter per object. 2015-10-16 22:21:26 +02:00
Laurent Destailleur
87c12717a7 NEW The thirdparties tabs, the contacts tabs and the members tabs are 
now presented using a new top banner, saving space and using a same way
to show address, status and navigation arrows.
 2015-10-16 20:16:28 +02:00
Laurent Destailleur
df0c6aa5cf Use the new card banner for members 2015-10-16 16:14:33 +02:00
Laurent Destailleur
dc5cc52395 NEW Merge all search fields of an area page into one search box 2015-10-16 10:52:49 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
b43047bc2f Use the new banner on all tabs of contacts 2015-10-15 14:13:31 +02:00
Laurent Destailleur
8a32041f16 Clean CSS when option MAIN_MAXTABS_IN_CARD is set 2015-10-15 13:31:44 +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
00c8b27baf Add code comment 2015-10-14 22:04:54 +02:00
Laurent Destailleur
e9aed15bed Work on the feature to select which field to show 2015-10-14 18:48:03 +02:00
Florian HENRY
00b610d87f FIX : fix HTML into formconfirm box 2015-10-14 08:23:52 +02:00
Laurent Destailleur
57ea4fc23d FIX sql syntax error when sort order not defined. 2015-10-13 14:40:02 +02:00
Laurent Destailleur
6520ed7a08 Use css not bold title. 
Add missing badge (count of draft records) on draft list.
 2015-10-13 14:09:14 +02:00
Laurent Destailleur
9f0c0bfc92 NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple 
replacement of translated string on the fly.
 2015-10-13 13:27:44 +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
918d9b7c18 Fix filter was lost if nothing found 2015-10-13 12:05:24 +02:00
aspangaro
0b54cc4509 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-11 21:05:15 +02:00
Laurent Destailleur
618e5f0419 FIX no need to remove file into mail form #3573 2015-10-11 20:47:31 +02:00
Laurent Destailleur
87fad70f4a Revert "FIX no need to remove file into mail form" 2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08 Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file 
FIX no need to remove file into mail form
 2015-10-11 20:42:42 +02:00
Laurent Destailleur
80bd563fde Use GETPOST 2015-10-11 20:41:06 +02:00
Laurent Destailleur
5b715c29e2 Merge pull request #3717 from marcosgdf/bug-3197 
FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination
 2015-10-11 20:30:33 +02:00
Laurent Destailleur
9a6ac4f457 CSS enhancement 2015-10-11 16:32:46 +02:00
Laurent Destailleur
7fae9450a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 15:21:45 +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
0ba6bdb7c2 CSS enhancement 2015-10-11 13:26:22 +02:00
Marcos García de La Fuente
8cd17c0165 FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination 
Close #3197
 2015-10-11 13:01:28 +02:00
Marcos García de La Fuente
4e9a378f0d Merge branch '3.6' into bug-1776 2015-10-11 12:37:41 +02:00
Laurent Destailleur
db9d09c7a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 12:28:03 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00
Laurent Destailleur
525f9841fa Fix doxygen 2015-10-10 18:38:22 +02:00
Laurent Destailleur
fb50daaa40 Fix bad parameter 2015-10-10 16:09:01 +02:00
Laurent Destailleur
0222867a94 The new banner for tab is moved into a shared functions 2015-10-10 12:01:09 +02:00
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
aspangaro
8f8de587b8 Add admin & first version to manage establishment 2015-10-10 06:39:59 +02:00
aspangaro
cd7c5645c7 Add library 2015-10-10 06:38:42 +02:00
aspangaro
5d7e05e313 Correct review 2015-10-10 06:00:55 +02:00
aspangaro
f6947afc2f Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-10 05:42:06 +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
279e7028fb Merge pull request #3686 from grandoc/3.7 
3.7
 2015-10-09 20:38:16 +02:00
Laurent Destailleur
f9485bd25b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2015-10-09 20:35:17 +02:00
Laurent Destailleur
b27989d5d4 Merge pull request #3665 from altatof/fix_extrafields 
reenable search criteria in sql clause
 2015-10-09 20:32:42 +02:00
Laurent Destailleur
ab4b423567 Merge pull request #3712 from GPCsolutions/fixunittests 
Fix unittests regression
 2015-10-09 20:19:21 +02:00
Laurent Destailleur
796a87e254 Merge pull request #3673 from apachler/develop 
Changes to ODT creation of proposal and invoice
 2015-10-09 20:18:55 +02:00
Raphaël Doursenaud
b785db86a8 Fix unittests regression 
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
 2015-10-09 19:02:44 +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
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