Laurent Destailleur
|
dc9c5ed5ef
|
Enhance transifex sync
|
2015-12-18 18:25:09 +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
|
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
|
74293cd7cc
|
git push origin developMerge branch 'GPCsolutions-dolibarr-cifix' into develop
|
2015-12-18 17:05:19 +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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
c03320ff0b
|
Merge pull request #4224 from aspangaro/develop-fec
Complete information on FEC format - french law
|
2015-12-16 19:10:17 +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 |
|
fappels
|
973339e071
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
|
2015-12-16 15:38:02 +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
|
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 |
|
Laurent Destailleur
|
af85ade7ff
|
Minor css fix
|
2015-12-15 10:24:31 +01:00 |
|