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

44271 Commits

Author SHA1 Message Date
Marcos García de La Fuente
ebdaf7dfa6 FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7 2015-12-27 15:12:02 +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
Marcos García de La Fuente
98351d6fec FIX #4302 Undefined variable $conf in Commande::LibStatut 2015-12-27 13:15:05 +01:00
Marcos García de La Fuente
67bdfa2617 FIX #4282 Defined shipping time were not shown in Customer order's PDF documents 2015-12-27 13:10: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
Marcos García
da959c5cf0 Little typo in commit 8b633ae 2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e Merge pull request #4289 from marcosgdf/bug-4285 
FIX #4285 SQL query shown when accessing an unexisting invoice
 2015-12-24 22:00:00 +01:00
Juanjo Menent
d4466a652a Merge pull request #4288 from marcosgdf/bug-4182 
FIX #4182 SQL error when deleting an unexisting bank entry
 2015-12-24 21:59:16 +01:00
Juanjo Menent
cdd1641b66 Merge pull request #4284 from frederic34/patch-7 
typo
 2015-12-24 15:50:24 +01:00
BENKE Charlie
ed501cec46 add odt info is present in class 2015-12-24 15:44:56 +01:00
Juanjo Menent
b9d0fc5aaf Merge pull request #4271 from grandoc/develop 
[Qual] Uniformize code
 2015-12-24 15:43:14 +01:00
BENKE Charlie
9c78b083bd add display odt info if method present in class 2015-12-24 15:42:47 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66 FIX #4182 SQL error when deleting an unexisting bank entry 2015-12-24 14:39:28 +01:00
Marcos García de La Fuente
d30c64413d FIX #4055 SQL error when trying to access a non-existing expedition 2015-12-24 14:27:12 +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
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +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
Frédéric FRANCE
45b60c7800 typo 2015-12-24 00:01:05 +01:00
Laurent Destailleur
18fdb75c98 Missing global 2015-12-23 20:02:15 +01:00
Laurent Destailleur
a9db42ddc1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-23 20:00:16 +01:00
Laurent Destailleur
559e621fd2 Fix conflict with trigger to delete payment customer and supplier. 2015-12-23 19:54:56 +01:00
Laurent Destailleur
2d3915b88c Fix hook implementation on some thirdparty pages 2015-12-23 14:31:42 +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
Florian HENRY
9441d98890 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-23 14:01:16 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
philippe grand
5e3c89fdbd [Qual] Uniformize code 2015-12-21 22:59:12 +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
6b25439161 Fix vietnamesefont 2015-12-21 20:41:02 +01:00
Laurent Destailleur
a1990f4c63 Fix css md theme 2015-12-21 17:34:21 +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
c740a85006 [Qual] Uniformize code 2015-12-21 14:43:21 +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
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +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
fec5f4e20b Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:40:32 +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
932c3f9172 Fix init of situation_percent 2015-12-21 12:37:58 +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
2f8fc05cdb Fix: QRcode must not be random 2015-12-20 21:28:05 +01:00
Laurent Destailleur
f243b5230f Fix search filter disappear and clean filter button not visible. 2015-12-20 20:24:12 +01:00
Laurent Destailleur
fa277ef634 Fix duplicate translation 2015-12-20 20:11:29 +01:00
philippe grand
7a33e2983d [Qual] Uniformize code 2015-12-20 10:36:20 +01:00
Laurent Destailleur
f0802eb36b FIX #4245 PHP 7 2015-12-19 19:48:36 +01:00
Laurent Destailleur
1c1d176715 Fix statistics was reporting bad value 2015-12-19 19:39:42 +01:00
Laurent Destailleur
065b7b6683 Fix ba alignement 2015-12-19 19:12:21 +01:00
Laurent Destailleur
55e90c5676 Try to restore lost file 2015-12-19 18:35:17 +01:00
Laurent Destailleur
f5c5dfd37f FIX #4185 2015-12-19 18:26:15 +01:00
Laurent Destailleur
3517b64031 FIX #4228 PHP7 error 2015-12-19 18:18:24 +01:00
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
Laurent Destailleur
ba9796a438 Merge pull request #4082 from atm-maxime/fix_situation_percent 
Fix : situation percent should be 100 by default
 2015-12-19 17:49:04 +01:00
Laurent Destailleur
3b2a921378 Fix a serial is required for stock change 2015-12-19 14:05:38 +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
50e496712e missing css style 2015-12-19 03:47:02 +01:00
Laurent Destailleur
bef971cacf Fix ergonomy. Adding a new entry is done from left menu. 2015-12-19 03:43:45 +01:00
Laurent Destailleur
b1051c7396 Fix picto 2015-12-19 03:30:35 +01:00
Laurent Destailleur
a4edd90320 Debug the cron module 2015-12-19 03:27:55 +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
bd91f327b8 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/filefunc.inc.php
 2015-12-19 01:38:22 +01:00
Laurent Destailleur
298396a57e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	test/phpunit/AllTests.php
 2015-12-19 01:27:19 +01:00
Laurent Destailleur
0df45f10c1 Fix travis 2015-12-19 01:09:42 +01:00
Laurent Destailleur
a136e90749 Fix travis 2015-12-19 01:06:11 +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
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
1b67a9faf1 Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal 
FIX label of line is set in description field if empty
 2015-12-18 18:21:20 +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
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
phf
c215898c52 FIX label of line is set in description field if empty 2015-12-18 17:11:14 +01:00
Laurent Destailleur
7af4d91828 Merge pull request #4251 from fmarcet/3.6 
FIX: Not deleting contracts on element_element table
 2015-12-18 17:07:42 +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
Laurent Destailleur
d0ec3f1152 Merge branch 'dolibarr-cifix' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix

Conflicts:
	htdocs/product/card.php
 2015-12-18 17:05:04 +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
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
philippe grand
6e45ad92fa fix some issue within setEventMessages attribut 2015-12-17 17:35:30 +01:00
philippe grand
b91031b693 fix some issue within my last commit 2015-12-17 17:20:28 +01:00
Laurent Destailleur
5f4947e3c1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-17 17:16:37 +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
philippe grand
93845ffa69 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-12-17 16:58:05 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
Laurent Destailleur
92343901d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-17 14:01:34 +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
fmarcet
21f7271e51 FIX: Not deleting contrats on element_element table 2015-12-17 12:36:43 +01:00
Raphaël Doursenaud
4f9ab7da24 FIX #4242 Allow disabling dashes in documents 
3.9 specific fix since document have moved
 2015-12-17 10:39:55 +01:00
Raphaël Doursenaud
7e98cfd5b6 FIX #4242 Allow disabling dashes in documents 
3.8 specific fix for new documents
 2015-12-17 10:33:17 +01:00
Raphaël Doursenaud
02e053acc6 FIX #4242 Allow disabling dashes in documents 
3.7 specific fix since document files have moved
 2015-12-17 10:26:27 +01:00
Raphaël Doursenaud
e6ec797af8 FIX #4242 Allow disabling dashes in documents 2015-12-17 10:21:44 +01:00
Raphaël Doursenaud
c2642acdba Fix CI build 578 (Syntax error) 
empty() only supports variables in PHP < 5.5
 2015-12-17 10:03:42 +01:00
Laurent Destailleur
34f4e913d4 Merge pull request #4240 from frederic34/patch-9 
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
 2015-12-16 19:58:48 +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
6133298e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2 Miscellaneous fixes 2015-12-16 19:26:50 +01:00
Laurent Destailleur
33ea5c83b7 Merge pull request #4238 from fappels/develop 
Fix product list page offset calculation
 2015-12-16 19:26:32 +01:00
Laurent Destailleur
acc4623b74 Merge pull request #4236 from defrance/patch-90 
fix ErrorBadValueForParamNotAString shit one again...
 2015-12-16 19:25:39 +01:00
Laurent Destailleur
609b8a8506 Merge pull request #4234 from aspangaro/develop-a3 
Accountancy- Add a column in table bookkeeping to validate operations
 2015-12-16 19:15:13 +01:00
Laurent Destailleur
7c1fc2fee1 Merge pull request #4233 from aspangaro/3.7-accountancy1 
Fix: Accountancy Add an empty field for list of parent account - This value can be null
 2015-12-16 19:14:45 +01:00
Laurent Destailleur
516e071363 Merge pull request #4232 from aspangaro/develop-remove_zero 
New: Accountancy add a function to remove all zero at the right of the account
 2015-12-16 19:13:43 +01:00
Laurent Destailleur
710a8bb6a9 Merge pull request #4231 from mrsof/patch-2 
Typo
 2015-12-16 19:11:24 +01:00
Laurent Destailleur
cd70b296c1 Merge pull request #4223 from fappels/develop-shipment-error-handling 
Fix not complete output of error messages in shipment
 2015-12-16 19:09:35 +01:00
Laurent Destailleur
d95be87e64 Merge pull request #4222 from grandoc/develop 
Fix not complete output of error messages
 2015-12-16 19:08:06 +01:00
Laurent Destailleur
7b17d2ce0c Merge pull request #4221 from mrsof/patch-1 
FIX : Fatal error: Cannot access empty property
 2015-12-16 19:07:24 +01:00
Laurent Destailleur
b2640498c4 Merge pull request #4219 from bafbes/patch-10 
Fix the list of thirdparty must be restricted to customer for invoices
 2015-12-16 19:04:01 +01:00
Laurent Destailleur
77e9ab763b Merge pull request #4216 from frederic34/patch-8 
FIX option MAIN_DISABLE_FULL_SCANLIST was not working for stock movements
 2015-12-16 19:02:53 +01:00
Laurent Destailleur
4ef832b94b Merge pull request #4215 from frederic34/patch-7 
Update sms.php
 2015-12-16 19:02:07 +01:00
Frédéric FRANCE
9e6698c6ca Update multiprix.php 2015-12-16 18:18:02 +01:00
cla
1ebe6fb9b5 UPDATE: 
sendings EN_US lang file
 2015-12-16 16:21:05 +01:00
cla
ef487c48a4 NEW 
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
 2015-12-16 16:18:29 +01:00
Francis Appels
3568b889bf Update list.php 
Fix page offset calculation
 2015-12-16 15:42:24 +01:00
Regis Houssin
cb7f29b332 Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2015-12-16 13:32:44 +01:00
BENKE Charlie
afe3e6ac27 fix ErrorBadValueForParamNotAString shit one again... 2015-12-16 12:38:32 +01:00
aspangaro
5cd5413836 Accountancy add a column in table bookkeeping to validate operations 2015-12-16 05:22:50 +01:00
aspangaro
dfbc2814e7 Fix: Add an empty field for list of parent account - This value can be null 2015-12-15 21:10:53 +01:00
aspangaro
36bc1321cb Merge remote-tracking branch 'Upstream/develop' into develop-remove_zero 2015-12-15 20:50:49 +01:00
aspangaro
c1e77daeb1 New: Accountancy add a function to remove all zero at the right of the account. 
Thanks to Florian
 2015-12-15 20:48:06 +01:00
Laurent Destailleur
90dbfc4870 Fix: to avoid confusion between amount of payment and amount distributed 
on invoice when a payment is done for several invoices, export of
payment can export both fields.
 2015-12-15 15:52:20 +01:00
Sof
011f0fbb0b FIX : Typo error 2015-12-15 14:04:52 +01:00
BENKE Charlie
23e727048e Add some new translations for export feature 2015-12-15 10:35:11 +01:00
Laurent Destailleur
af85ade7ff Minor css fix 2015-12-15 10:24:31 +01:00
Laurent Destailleur
3e3dbf850f Fix: bad case for function 2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
aspangaro
687370071b A function to remove zero at the end of the account 2015-12-14 21:38:30 +01:00
fappels
9fa742ceb2 [QUAL] Shipment error handling 2015-12-14 21:38:26 +01:00
Laurent Destailleur
ed88a4c398 Fix css 2015-12-14 21:38:04 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
Sof
4c60569cc4 FIX : Fatal error: Cannot access empty property 2015-12-14 15:42:21 +01:00
Bahfir Abbes
e415a3ddf2 Update facture.php 
fix change customer function in customer invoices - include customers or prospects only
 2015-12-14 15:01:29 +01:00
Laurent Destailleur
b9aa80c4ca Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-14 10:33:32 +01:00
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Frédéric FRANCE
af5bcc5312 Update mouvement.php 2015-12-14 09:31:40 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI 
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
 2015-12-13 21:34:36 +01:00
Frédéric FRANCE
1aa232c4a7 Update CSMSFile.class.php 2015-12-13 21:14:53 +01:00
Frédéric FRANCE
65cebe37f3 Update sms.php 2015-12-13 21:12:08 +01:00