lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,695 Commits 43 Branches 150 Tags 886 MiB
d8e173af03
Commit Graph

8901 Commits

Author SHA1 Message Date
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6 
Fix: Some problems presentation on accountancy module
 2016-01-30 13:04:22 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6 2016-01-24 07:04:20 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification 
FIX line refetch incompatible with hook practice
 2016-01-22 04:10:06 +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
Laurent Destailleur
d857b3475b Fix doxygen 2016-01-22 03:07:46 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
3c68ac55b9 Fix missing loading lang 2016-01-21 15:00:39 +01:00
Alexis Algoud
48d674578b FIX line is refetch (and seems useless) unless it was modified by the hook previous calling 2016-01-19 11:54:07 +01:00
Marcos García de La Fuente
da637db162 FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays 2016-01-18 10:17:59 +01:00
Laurent Destailleur
be4f9baac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4 FIX: Sql syntax error in doc_generic_task_odt 2016-01-16 10:20:14 +01:00
Laurent Destailleur
6acd31f8ad Fix: style required in create or edit mode only 2016-01-15 00:44:38 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
arnaud
8b2541ebf9 FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules 2016-01-14 14:10:50 +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
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372 
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
 2016-01-13 20:41:32 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +01:00
phf
f280061a90 FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf 2016-01-12 11:09:47 +01:00
Laurent Destailleur
a9f0d6964a Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2016-01-10 18:47:47 +01:00
Laurent Destailleur
801e2bca4b Fix #4239 2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b Fix: markRate can be 100 2016-01-10 18:28:50 +01:00
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
Laurent Destailleur
70b57322a2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-10 13:05:35 +01:00
Laurent Destailleur
6685502d5c Fix add Croatia into list of country in EEC 2016-01-10 13:05:22 +01:00
Laurent Destailleur
70ffcfea33 Merge pull request #4380 from aspangaro/3.9-p4 
Fix: Donation some problems with french article
 2016-01-10 11:46:12 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
Laurent Destailleur
2764fb240f Fix text color for category tags 
Fix banner for category translation tab
 2016-01-10 00:11:49 +01:00
Laurent Destailleur
b2924885aa Fix css 2016-01-09 03:00:12 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on 
some documents tabs.
 2016-01-09 01:54:46 +01:00
Laurent Destailleur
e5d0bc9d57 Fix permission not used 2016-01-09 00:34:15 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
de36db19bc Fix do not show warehouse for shipment on not predefined product 2016-01-08 18:15:53 +01:00
Laurent Destailleur
d4aa83e7ca Merge pull request #4343 from grandoc/develop 
translations
 2016-01-08 14:07:05 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Laurent Destailleur
befe58ab98 Fix selection of first entry into select 2016-01-07 13:44:19 +01:00
Laurent Destailleur
4e2d4a6651 Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. 
Solved this by completing tooltip info.
 2016-01-07 11:01:37 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +01:00
Sergio Sanchis Climent
dfdf58051e Edited correctly for check values 2016-01-07 09:37:04 +01:00
Laurent Destailleur
2945d2d171 Fix bad condition to show tabs 2016-01-07 00:05:28 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +01:00
Sergio Sanchis Climent
ffd7f4ea30 Fix userlocaltax 
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
 2016-01-05 09:47:14 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565 Fix search forms 2016-01-03 18:46:10 +01:00
Laurent Destailleur
abe3f192fa Debug and fix when using dolibarr with jmobile 2016-01-03 16:23:23 +01:00
Laurent Destailleur
96e5651ed5 Fix missing field on list. Restor ability to search on supplier ref. 2016-01-03 14:38:47 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Laurent Destailleur
04c5516483 Fix the format "dayall" does not exists. Instead add missing format 
"_locale" using correct language file.
 2016-01-02 11:51:40 +01:00
Laurent Destailleur
865d93b19e Merge pull request #4324 from defrance/patch-93 
Add rfc and dayall format for extrafields date
 2016-01-02 11:39:42 +01:00
Laurent Destailleur
1ae4bef04b Fix conflict with the div #dialog used for popup cut and paste of 
address.
 2016-01-02 00:27:14 +01:00
BENKE Charlie
dbb8e49654 Update commondocgenerator.class.php 2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b Add rfc and dayall format for extrafields date 2015-12-31 18:50:28 +01:00
Laurent Destailleur
2cbcbb8f85 Merge pull request #4319 from ParisLiakos/develop 
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
 2015-12-31 15:04:16 +01:00
Laurent Destailleur
a234482d08 FIX #3694 2015-12-31 14:55:53 +01:00
Laurent Destailleur
c004342976 FIX #3694 2015-12-31 14:55:10 +01:00
Paris Liakos
b6b422042c MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden 2015-12-29 03:43:49 +02: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
5afed31265 Merge pull request #4305 from marcosgdf/bug-4036 
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
 2015-12-27 17:37:29 +01:00
Laurent Destailleur
a9b52f36e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-27 17:06:05 +01:00
Laurent Destailleur
c64eac5e72 Fix doc and mysql min version 2015-12-27 17:05:56 +01:00
Marcos García de La Fuente
c40c695d20 FIX #4036 Direct printing module without any driver configured, shows an unformatted error message 2015-12-27 14:58:33 +01:00
bobby
e557c002c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-26 11:56:10 +01:00
Marcos García de La Fuente
686348a0d6 FIX #4287 SQL error when accessing an unexisting proposal 2015-12-25 11:47:48 +01:00
Laurent Destailleur
a4d5e022cf Fix pagination on limit failed when limit was forced on url 2015-12-24 12:52:11 +01:00
Laurent Destailleur
66e0c1285e Disable a bugged box 2015-12-24 11:38:30 +01:00
Laurent Destailleur
74e8738ca7 Fix: if option to select thirdparties using a combo box after n chars 
was on, it was no more possible to clear the filter.
 2015-12-24 11:24:56 +01:00
Florian HENRY
930eb6dccf FIX : bug with head.lib.js if MAIN_MAX_DECIMALS_SHOWN use ... 
FIX : List of supplier order to invoice must use billed new column
 2015-12-23 14:15:30 +01:00
Laurent Destailleur
ad5f65e988 Fix: use the mini image on tooltip of thirdparties 2015-12-21 17:32:57 +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
Laurent Destailleur
536413523a Fix to show ref of linked object on documents. Fix is not complete but 
stable.
 2015-12-21 12:52:10 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:38:23 +01:00
Laurent Destailleur
7e03aaee23 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php
 2015-12-21 12:24:24 +01:00
Laurent Destailleur
b179a193dd Fix param for username is $username and not $login 2015-12-21 03:01:37 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page 
Fix Missing translations
 2015-12-21 00:47:44 +01:00
Laurent Destailleur
f0802eb36b FIX #4245 PHP 7 2015-12-19 19:48:36 +01:00
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
Laurent Destailleur
d7e9c92144 Fix bad link on category 
Fix cancel button on categories
Css enhancement.
 2015-12-19 13:55:27 +01:00
Laurent Destailleur
b1051c7396 Fix picto 2015-12-19 03:30:35 +01:00
Laurent Destailleur
a973c91c24 Fix pagination on cron jobs 
Fix perf when too much lines
 2015-12-19 02:39:44 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
 2015-12-18 21:03:57 +01:00
Laurent Destailleur
484dc5937b Fix regression in sorting 2015-12-18 18:05:07 +01:00
Laurent Destailleur
43044bbb4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-18 17:32:54 +01:00
Laurent Destailleur
eaacfabdf6 Merge pull request #4261 from hregis/3.8_bug 
Fix: Disable "main.inc.php" hooks with ajax return
 2015-12-18 17:32:45 +01:00
Laurent Destailleur
4998516835 Code comment 2015-12-18 17:31:50 +01:00