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
aspangaro
e0da56bcd0
Accountancy Add a list to select accounting account on donation admin
2015-12-26 05:56:14 +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
Bahfir Abbes
0027e1a8ba
Include local constants files and fetch their values to the corresponding database constants
...
Modules may declare their file constants in a file named as : "module name"_consts.php and located in the module root folder.
They may also assign a correspondence between file constants they define and their equivalent database constants in a table named $file2bddconsts defined in their constants file.
To get this two functions the module need to add its name to the list of modules in LOCAL_CONSTS_FILES.
2015-12-24 20:25:54 +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
aspangaro
ec7cffd6a4
Merge remote-tracking branch 'Upstream/develop' into develop-a7
2015-12-22 07:11:10 +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
aspangaro
e38106019d
Add conditions to show menu on modules admin tools
2015-12-20 08:11:33 +01:00
aspangaro
e043098cc3
Add link in modules tools & correct auguria menu
2015-12-20 07:58:54 +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
aspangaro
8b3a5ac06f
Correct on auguria module
2015-12-19 06:39:25 +01:00
aspangaro
dc6143b6c7
Depend on accountancy module activation for the moment
2015-12-19 06:25:24 +01:00
aspangaro
2de5db927e
Merge remote-tracking branch 'Upstream/develop' into develop-a5
2015-12-19 05:50:19 +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
fappels
982db2e01f
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
2015-12-18 19:31:02 +01:00
Laurent Destailleur
484dc5937b
Fix regression in sorting
2015-12-18 18:05:07 +01:00
fappels
7fc8007571
New add shipping and dispatching from/to multiple warehouses
...
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
2015-12-18 18:00:31 +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
Laurent Destailleur
724817b966
Merge pull request #4259 from aschio/develop_sunimport
...
Adding extrafields to shipments module
2015-12-18 17:28:35 +01:00
Laurent Destailleur
dc8e5f45ae
Merge pull request #4254 from grandoc/develop
...
[Qual] Uniformize code
2015-12-18 17:13:22 +01:00
Laurent Destailleur
c328860af0
Merge pull request #4250 from GPCsolutions/dolibarr-4242
...
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:07:00 +01:00
Laurent Destailleur
452feca64a
Merge pull request #4249 from GPCsolutions/3.8-4242
...
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:06:51 +01:00
Regis Houssin
70354def7c
Fix: Disable "main.inc.php" hooks with ajax return
2015-12-18 13:27:51 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
cla
cb96618460
Merge branch 'develop' into develop_sunimport
2015-12-18 10:49:57 +01:00
Laurent Destailleur
b10f9d4ca3
Fix: when doing an export of extrafields, we must use different table
...
alias for each extrafield table.
2015-12-17 20:40:33 +01:00
Laurent Destailleur
cdc408a84c
Fix: button "now" was not working on date using no javascript
2015-12-17 17:16:26 +01:00
philippe grand
367d9de0b7
fix some translation
2015-12-17 17:12:28 +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
aspangaro
ea73e0253c
Move fiscal year from accountancy module to configuration of Dolibarr
2015-12-17 13:09:46 +01:00
