Laurent Destailleur
|
36461afea9
|
FIX Creation of Stripe card from backoffice must return a clean message
|
2020-02-03 14:55:02 +01:00 |
|
Laurent Destailleur
|
7b661e707e
|
FIX Creation of Stripe card from backoffice must return a clean message
|
2020-02-03 14:54:35 +01:00 |
|
ptibogxiv
|
eb5ac0d9a9
|
fix url field in edit mode societe/card.php
|
2020-02-03 14:28:57 +01:00 |
|
Laurent Destailleur
|
f752551914
|
WIP Generic stats page
|
2020-01-31 14:53:47 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
c103ff58cf
|
FIX update of llx_societe_account for stripe customer key.
|
2020-01-27 12:41:22 +01:00 |
|
Laurent Destailleur
|
7b65cdb75a
|
FIX update of llx_societe_account for stripe customer key.
|
2020-01-27 12:40:20 +01:00 |
|
Laurent Destailleur
|
df478dc170
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-27 01:53:49 +01:00 |
|
Laurent Destailleur
|
7438f92912
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
|
2020-01-27 01:50:02 +01:00 |
|
atm-greg
|
f5395fa859
|
fix lost name_alias on country selection
|
2020-01-24 14:28:08 +01:00 |
|
Laurent Destailleur
|
27a0858050
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-23 17:41:31 +01:00 |
|
Laurent Destailleur
|
040f8bef5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/societe/class/societe.class.php
|
2020-01-22 16:29:04 +01:00 |
|
Laurent Destailleur
|
381f2d5eee
|
Fix typo
|
2020-01-22 16:24:16 +01:00 |
|
Laurent Destailleur
|
7964699674
|
FIX Check on unicity on prof id was not triggered sometimes
|
2020-01-22 16:22:53 +01:00 |
|
Laurent Destailleur
|
88d01fbb22
|
Save also customer account onn card level.
|
2020-01-22 16:02:28 +01:00 |
|
Laurent Destailleur
|
24d439845b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-18 20:20:25 +01:00 |
|
Juanjo Menent
|
057a40dcb2
|
FIX: In third parties creation, when changing the country drop down, the states are not recharged
|
2020-01-17 17:05:29 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
5772dce460
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-01-15 12:09:21 +01:00 |
|
Laurent Destailleur
|
b6ed6df75d
|
Remove property tha has no sense in output #12803
|
2020-01-13 14:14:51 +01:00 |
|
Laurent Destailleur
|
ed2c75a2f8
|
Merge pull request #12776 from aspangaro/12.0_a4
NEW Add social networks of the company
|
2020-01-13 13:38:16 +01:00 |
|
Laurent Destailleur
|
b47db086cb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
|
2020-01-10 14:30:42 +01:00 |
|
Laurent Destailleur
|
d97a59ac4a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
|
2020-01-10 14:25:26 +01:00 |
|
ptibogxiv
|
5a1f123994
|
Update societe.class.php
|
2020-01-07 13:10:10 +01:00 |
|
Laurent Destailleur
|
b9e0f8999f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2020-01-04 14:03:21 +01:00 |
|
Laurent Destailleur
|
d95e37aa72
|
Look and feel v11
|
2020-01-02 20:43:16 +01:00 |
|
Laurent Destailleur
|
298f6d0683
|
Look and feel v11
|
2020-01-02 20:36:35 +01:00 |
|
Laurent Destailleur
|
5cb8cceb82
|
FIX Do not update timestamp when we set the "default" to another record
|
2020-01-02 20:29:19 +01:00 |
|
Laurent Destailleur
|
dbb65d864e
|
fix missing column
|
2020-01-02 19:05:03 +01:00 |
|
Laurent Destailleur
|
b7bf12819a
|
Add label in list of Stripe payments
|
2020-01-02 17:19:42 +01:00 |
|
Laurent Destailleur
|
52767c4324
|
NEW Can enter and edit stripe credit card using the Stripe card ID
|
2020-01-02 15:45:25 +01:00 |
|
Laurent Destailleur
|
fff805e7ec
|
Look and feel v11
|
2020-01-02 15:10:46 +01:00 |
|
Frédéric FRANCE
|
90235d0528
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-31 13:57:40 +01:00 |
|
Alexandre SPANGARO
|
c664a1e42d
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-12-31 08:34:37 +01:00 |
|
Alexandre SPANGARO
|
9879a43cf4
|
NEW Add social networks of the company
|
2019-12-30 21:17:41 +01:00 |
|
Laurent Destailleur
|
4333cf2040
|
Show the stripe accoutn of a cu_ and a card_
|
2019-12-24 12:53:10 +01:00 |
|
Laurent Destailleur
|
bceba83f0c
|
Fix position of fields
|
2019-12-20 10:42:05 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
db5672ae90
|
Fix creation/update of expense reports
Fix export of accounting documents
|
2019-12-18 23:07:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
455178ff73
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-18 14:20:36 +00:00 |
|
Scrutinizer Auto-Fixer
|
404ae0c209
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-17 02:00:52 +00:00 |
|
Laurent Destailleur
|
95fc14475c
|
Fix show correct stripe publishable_key on payment mode page
|
2019-12-15 17:32:45 +01:00 |
|
Laurent Destailleur
|
cb71d5a7bb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-15 17:18:21 +01:00 |
|
Laurent Destailleur
|
0ef3de98c6
|
Try to fix conflict of several stripe accounts
|
2019-12-15 17:18:09 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Frédéric FRANCE
|
57055bad03
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-13 14:36:00 +01:00 |
|
stickler-ci
|
380b698c6f
|
Fixing style errors.
|
2019-12-12 16:09:23 +00:00 |
|
Anthony Berton
|
43f150dc42
|
Update societe.class.php
|
2019-12-12 17:02:59 +01:00 |
|
Laurent Destailleur
|
0bb5df42e1
|
Merge pull request #12650 from frederic34/patch-15
The property datem does not exist on Societe
|
2019-12-09 13:04:31 +01:00 |
|
Laurent Destailleur
|
816f2075fb
|
Merge pull request #12651 from frederic34/patch-17
The variable $db seems to be never defined
|
2019-12-09 13:03:11 +01:00 |
|
Frédéric FRANCE
|
48564ea760
|
doxygen societe class
|
2019-12-08 14:26:59 +01:00 |
|
Frédéric FRANCE
|
f0af450494
|
The variable $db seems to be never defined
The variable $db seems to be never defined on line 154
|
2019-12-08 13:40:55 +01:00 |
|
Frédéric FRANCE
|
ab33bb1d3b
|
The property datem does not exist on Societe
|
2019-12-08 13:37:50 +01:00 |
|
Laurent Destailleur
|
02e2b72190
|
Use , as separator instead of / for type of third party. This reduce
space used.
|
2019-12-06 10:46:14 +01:00 |
|
Frédéric FRANCE
|
d9bfa62367
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-05 21:47:42 +01:00 |
|
Florian Mortgat
|
3f6715a377
|
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
|
2019-12-05 15:34:41 +01:00 |
|
Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +01:00 |
|
Laurent Destailleur
|
2c86aab9ca
|
Fix responsive
|
2019-12-03 15:22:46 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
Laurent Destailleur
|
6388370edc
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-12-01 10:51:16 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
Laurent Destailleur
|
6bf3af5d83
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
|
2019-12-01 10:30:22 +01:00 |
|
Laurent Destailleur
|
1d564c2a39
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/core/class/notify.class.php
|
2019-12-01 00:58:01 +01:00 |
|
Laurent Destailleur
|
f549c4fc9c
|
Merge pull request #12544 from frederic34/select_produits
Form select_produits returns void
|
2019-12-01 00:47:02 +01:00 |
|
Maxime Kohlhaas
|
916954b301
|
Fix #12371 : access rights on contacts
|
2019-11-30 14:48:05 +01:00 |
|
Maxime Kohlhaas
|
e0487ea861
|
Fix #12483 : fix thirdparty numbering module selection
|
2019-11-30 01:37:15 +01:00 |
|
Frédéric FRANCE
|
c214dd0675
|
Form select_produits returns void
|
2019-11-28 21:23:53 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Laurent Destailleur
|
70882a749a
|
Fix responsive for md theme
|
2019-11-20 14:40:52 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Scrutinizer Auto-Fixer
|
1648fc142e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:24:29 +00:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Frédéric FRANCE
|
6784ea9fae
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-16 09:21:57 +01:00 |
|
Frédéric FRANCE
|
fc55123af0
|
Update api_thirdparties.class.php
|
2019-11-14 18:31:09 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Frédéric FRANCE
|
446c66da62
|
use class CONST
|
2019-11-14 08:15:39 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Laurent Destailleur
|
16c50c212c
|
Update paymentmodes.php
|
2019-11-13 19:16:10 +01:00 |
|
stickler-ci
|
366dfc0e5c
|
Fixing style errors.
|
2019-11-13 18:15:19 +00:00 |
|
Laurent Destailleur
|
88d2658625
|
Merge branch 'develop' into scrutinizer-patch-2
|
2019-11-13 19:14:50 +01:00 |
|
Laurent Destailleur
|
19fba02fb3
|
Merge pull request #12410 from andreubisquerra/develop
Check if draft exists in TakePOS customer list
|
2019-11-13 18:49:03 +01:00 |
|
Laurent Destailleur
|
a14042e4b2
|
Update list.php
|
2019-11-13 18:48:39 +01:00 |
|
Laurent Destailleur
|
cc70ffd1b3
|
Update list.php
|
2019-11-13 18:47:35 +01:00 |
|
Scrutinizer Auto-Fixer
|
87585c0f2a
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 17:32:11 +00:00 |
|
ptibogxiv
|
24bac213aa
|
Update paymentmodes.php
|
2019-11-12 18:39:39 +01:00 |
|
ptibogxiv
|
e33d969178
|
Fix php error on stripe account display
convert non object in full array in order to avoid php error message.
|
2019-11-12 18:38:23 +01:00 |
|
andreubisquerra
|
34b8325079
|
Update list.php
|
2019-11-12 14:21:49 +01:00 |
|
andreubisquerra
|
4f3d4950e1
|
Check if draft exists in TakePOS customer list
Check if draft invoice already exists, if not create it
|
2019-11-12 13:01:16 +01:00 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
stickler-ci
|
b892ed05ba
|
Fixing style errors.
|
2019-11-10 11:17:19 +00:00 |
|
Philippe GRAND
|
d907f36bb6
|
add some comment
|
2019-11-10 12:16:51 +01:00 |
|
Laurent Destailleur
|
2fa82d1bfb
|
Fix sql error
|
2019-11-08 13:46:49 +01:00 |
|
Laurent Destailleur
|
83090629fe
|
Fix join into left join
|
2019-11-08 13:43:26 +01:00 |
|
Laurent Destailleur
|
4433cff49d
|
Merge pull request #12346 from frederic34/centpercent
100% centpercent
|
2019-11-07 10:39:09 +01:00 |
|
Laurent Destailleur
|
e885345ef7
|
FIX Check on duplicate profid was not triggered.
|
2019-11-06 00:27:36 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
6f82c212a0
|
Finished migration to the new architecture of extrafields
|
2019-11-02 17:38:19 +01:00 |
|
Laurent Destailleur
|
c03fabb789
|
Clean var
|
2019-11-02 14:26:27 +01:00 |
|
Laurent Destailleur
|
c9a620d1a6
|
Renamed property of thirdparty "statut_commercial" into
"status_prospect_label"
|
2019-11-02 14:25:52 +01:00 |
|
Laurent Destailleur
|
1cc9954f61
|
Clean api from bad vars
|
2019-11-02 14:20:43 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
stickler-ci
|
dc97a54d82
|
Fixing style errors.
|
2019-11-02 09:39:05 +00:00 |
|
Philippe GRAND
|
3ff5389c4e
|
add some comment
|
2019-11-02 10:35:43 +01:00 |
|
Scrutinizer Auto-Fixer
|
50f55cac35
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-02 00:17:45 +00:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Laurent Destailleur
|
01ac313a87
|
Fix phpcs
|
2019-10-31 23:52:05 +01:00 |
|
Laurent Destailleur
|
6a39ecc3c0
|
Fix phpcs
|
2019-10-31 23:33:11 +01:00 |
|
Laurent Destailleur
|
68a4ddceed
|
Look and feel v11
|
2019-10-31 23:29:17 +01:00 |
|
Laurent Destailleur
|
c9fc17efae
|
Fix phpcs
|
2019-10-31 23:06:34 +01:00 |
|
Laurent Destailleur
|
af09c77a0c
|
Fix phpcs
|
2019-10-31 22:15:18 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
Philippe GRAND
|
502d08af0c
|
add some comment
|
2019-10-30 10:10:22 +01:00 |
|
Laurent Destailleur
|
8f5b0f5d4d
|
Merge pull request #12207 from altatof/sortcontact
Sort contacts by lastname, firstname instead of nothing
|
2019-10-30 03:27:42 +01:00 |
|
Laurent Destailleur
|
0e667776e9
|
Merge pull request #12225 from ptibogxiv/patch-270
NEW Get thirdparty's salesrepresentatives by API
|
2019-10-30 03:12:20 +01:00 |
|
Laurent Destailleur
|
488edec3a8
|
Merge pull request #12226 from ptibogxiv/patch-271
NEW add office phone & job on user tooltips
|
2019-10-30 03:11:28 +01:00 |
|
Frédéric FRANCE
|
8f6d38ee82
|
clean indent
|
2019-10-27 17:01:23 +01:00 |
|
ptibogxiv
|
b96cbec2b5
|
Update linesalesrepresentative.tpl.php
|
2019-10-26 15:00:42 +02:00 |
|
ptibogxiv
|
bb89a16c1a
|
Update societe.class.php
|
2019-10-26 14:59:43 +02:00 |
|
ptibogxiv
|
63cc942298
|
Update linesalesrepresentative.tpl.php
|
2019-10-25 17:20:42 +02:00 |
|
stickler-ci
|
20b518d527
|
Fixing style errors.
|
2019-10-25 15:15:58 +00:00 |
|
ptibogxiv
|
a79283c490
|
NEW add office phone for salespresentatives
for complete https://github.com/Dolibarr/dolibarr/pull/12225
|
2019-10-25 17:15:34 +02:00 |
|
ptibogxiv
|
b449d5f7e6
|
NEW Get thirdparty's salesrepresentatives by API
|
2019-10-25 17:14:00 +02:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Laurent Destailleur
|
6855f588b5
|
Use dolGetStatus
|
2019-10-24 16:38:06 +02:00 |
|
altairis
|
0481e0b0d1
|
sort contact list on lastname
|
2019-10-23 17:31:26 +02:00 |
|
Laurent Destailleur
|
b88968520b
|
Move code of extrafields to the new architecture
|
2019-10-22 17:08:37 +02:00 |
|
Laurent Destailleur
|
22a14e7bf7
|
Fix closig tag
|
2019-10-22 15:40:29 +02:00 |
|
Laurent Destailleur
|
9be9f912af
|
Merge pull request #12192 from Ahuahuachi/develop
Translate documentation and minor code improvement
|
2019-10-22 12:32:40 +02:00 |
|
Laurent Destailleur
|
e261d63295
|
NEW Can add a button "Create" after combo of object with modulebuilder.
|
2019-10-21 14:44:39 +02:00 |
|
Alfredo Altamirano
|
0c5fbdf29d
|
Translate french documentation
|
2019-10-20 19:18:39 -05:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Cédric
|
29bad6c7e8
|
Replace $sortfield by $email in annotation
|
2019-10-19 16:55:12 +02:00 |
|
c3do
|
ae3ce37a57
|
copyright mentions
|
2019-10-19 16:45:30 +02:00 |
|
c3do
|
bb70db82c2
|
Can get thirdparty by email through API Rest
|
2019-10-19 16:43:10 +02:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Laurent Destailleur
|
5a5f4c3d72
|
Look and feel v11
|
2019-10-17 16:59:26 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
b60ddc255c
|
Removed useless html tags
|
2019-10-16 14:17:53 +02:00 |
|
Laurent Destailleur
|
363000f5b9
|
Merge pull request #12140 from ptibogxiv/patch-268
NEW mode for list thirdparty API (add easy filter for supplier only)
|
2019-10-16 13:25:05 +02:00 |
|
Laurent Destailleur
|
e1521b6c7d
|
Fix phpcs
|
2019-10-16 12:31:44 +02:00 |
|
Laurent Destailleur
|
517fcf45d1
|
Look and feel v11
|
2019-10-16 11:23:06 +02:00 |
|
Laurent Destailleur
|
e07e01580d
|
Replace deprecated code with new one
|
2019-10-16 03:34:32 +02:00 |
|
ptibogxiv
|
0d69ae9e8c
|
NEW mode for list thirdparty API (add supplier)
add new mode for more universel use of the api and easy switch between customer's and supplier's modes
|
2019-10-15 09:52:14 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Laurent Destailleur
|
516d943d1b
|
Merge pull request #12120 from iouston/patch-6
Update document.php
|
2019-10-14 21:18:33 +02:00 |
|
Laurent Destailleur
|
3866ac6036
|
Update document.php
|
2019-10-14 21:18:22 +02:00 |
|
iouston
|
6ebdce8a9d
|
Update document.php
add 2 hidden options for set a default field and a default order on document page
|
2019-10-14 15:13:07 +02:00 |
|
Frédéric FRANCE
|
352df8241e
|
Update api_thirdparties.class.php
|
2019-10-13 06:19:40 +02:00 |
|
Frédéric FRANCE
|
809d98129f
|
Update api_thirdparties.class.php
|
2019-10-13 06:14:45 +02:00 |
|
Frédéric FRANCE
|
9eaad23564
|
Update api_contacts.class.php
|
2019-10-13 06:12:53 +02:00 |
|
Frédéric FRANCE
|
2d3a6d2108
|
Update card.php
|
2019-10-13 06:05:21 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
de107fb02e
|
NEW Can set a squarred icon on your company setup
|
2019-10-11 11:27:05 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
3acf7211c3
|
Merge pull request #11847 from ptibogxiv/patch-257
NEW: Option to allow to create members from third-party
|
2019-10-08 15:08:34 +02:00 |
|
Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
eba3d96293
|
Update card.php
NEW Add option MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS
|
2019-10-07 20:36:48 +02:00 |
|
Laurent Destailleur
|
297313e7de
|
CSS
|
2019-10-07 16:01:36 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
Laurent Destailleur
|
68c28ab3c7
|
FIX Look and feel v10
|
2019-10-04 12:31:25 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Laurent Destailleur
|
ba7a288abb
|
Fix colspan and columns of contact of thirdparties
|
2019-10-01 23:28:13 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Frédéric FRANCE
|
010b2723b6
|
work on migration script
|
2019-10-01 20:14:06 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
b8dea76760
|
zapier api
|
2019-09-30 22:09:11 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Frédéric FRANCE
|
fec67aade4
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 18:44:34 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Laurent Destailleur
|
df1a23ed76
|
Code comment
|
2019-09-30 13:04:01 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Frédéric FRANCE
|
c7120e9e31
|
test
|
2019-09-29 20:36:18 +02:00 |
|
stickler-ci
|
21db14b22a
|
Fixing style errors.
|
2019-09-29 18:21:26 +00:00 |
|
Frédéric FRANCE
|
0735bb5860
|
test
|
2019-09-29 20:21:05 +02:00 |
|
Frédéric FRANCE
|
1a12c93dc7
|
test
|
2019-09-29 20:06:30 +02:00 |
|
Frédéric FRANCE
|
1ef3a67644
|
test
|
2019-09-29 19:26:25 +02:00 |
|
Frédéric FRANCE
|
4bac865205
|
test
|
2019-09-29 18:40:36 +02:00 |
|
Frédéric FRANCE
|
cedad3dc26
|
fix?
fix?
fix
|
2019-09-29 18:23:31 +02:00 |
|
Frédéric FRANCE
|
05f3d86921
|
fix?
|
2019-09-29 11:48:53 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Frédéric FRANCE
|
6c8dc75c96
|
socialnetworks for thirdparties
|
2019-09-29 11:20:23 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
Laurent Destailleur
|
9bf952cae5
|
Merge pull request #11938 from ptibogxiv/patch-265
FIX new display for stripe account
|
2019-09-27 14:00:55 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +02:00 |
|
Frédéric FRANCE
|
55e340c60b
|
closedir only if $handle is ressource
|
2019-09-25 21:47:43 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
ptibogxiv
|
d3b5197956
|
FIX new display for stripe account
invert col and row for better display
|
2019-09-20 13:02:50 +02:00 |
|
Frédéric FRANCE
|
61e358bb9d
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-18 21:23:26 +02:00 |
|
Laurent Destailleur
|
41a2a25729
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/ligne.php
|
2019-09-17 12:23:58 +02:00 |
|
Frédéric FRANCE
|
850b9fd52a
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-17 08:24:31 +02:00 |
|
Maxime Kohlhaas
|
5d4f702920
|
Remove bas copy / paste
|
2019-09-15 16:38:03 +02:00 |
|
Laurent Destailleur
|
23860b15ee
|
Try a fix for #11852
|
2019-09-15 16:00:01 +02:00 |
|
Frédéric FRANCE
|
ff77d613fb
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-15 11:24:13 +02:00 |
|
Laurent Destailleur
|
5ba6a90acc
|
Fix responsive
|
2019-09-15 10:49:40 +02:00 |
|
Frédéric FRANCE
|
6444c7378f
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 16:40:23 +02:00 |
|
Frédéric FRANCE
|
c9c7d60fc0
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:37:10 +02:00 |
|
Laurent Destailleur
|
76f478dc44
|
Fix look and feel
|
2019-09-14 14:25:47 +02:00 |
|
Frédéric FRANCE
|
62922884fe
|
specimens
|
2019-09-12 18:12:28 +02:00 |
|
Frédéric FRANCE
|
9f3c54e5a5
|
definitions
|
2019-09-12 18:04:24 +02:00 |
|
Frédéric FRANCE
|
3fddef0c9e
|
add socialnetworks dictionary
|
2019-09-11 22:27:09 +02:00 |
|
stickler-ci
|
2e63e7bc27
|
Fixing style errors.
|
2019-09-08 18:17:51 +00:00 |
|
ptibogxiv
|
e37875f70a
|
Update card.php
|
2019-09-08 20:16:05 +02:00 |
|
ptibogxiv
|
1368236d29
|
Update card.php
|
2019-09-08 20:15:05 +02:00 |
|
Frédéric FRANCE
|
bd4c9a64a8
|
wip
|
2019-09-07 14:48:25 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Laurent Destailleur
|
bd47bd096b
|
NEW Can defined a position of numbering submodules for thirdparties
|
2019-09-03 15:58:20 +02:00 |
|
Laurent Destailleur
|
7dc7ec1a6d
|
Merge pull request #11770 from ptibogxiv/patch-249
Fix var $amount
|
2019-09-03 12:56:28 +02:00 |
|
Laurent Destailleur
|
98459363df
|
Merge pull request #11795 from jtraulle/fix-doxygen-examples
Fix Wrongly catched examples by Doxygen
|
2019-09-03 12:45:23 +02:00 |
|
Laurent Destailleur
|
ddae5315f1
|
Updat fontawesome to 5.10.2
|
2019-09-02 16:13:11 +02:00 |
|
Laurent Destailleur
|
8cff008156
|
Fix error reporting
|
2019-09-02 16:03:20 +02:00 |
|
Laurent Destailleur
|
7f6ea3855c
|
Fix error report of LDAP
|
2019-09-02 16:01:51 +02:00 |
|
Laurent Destailleur
|
a269082d70
|
Replace deprecated code with new one
|
2019-09-02 03:58:00 +02:00 |
|
Jean Traullé
|
c32c7d48ba
|
Fix Wrongly catched examples by Doxygen
|
2019-08-30 17:14:59 +02:00 |
|
Laurent Destailleur
|
05c9e97fe4
|
The deprecated method get_OutstandingBill has been removed. You can use
getOutstandingBills() instead.
|
2019-08-29 00:45:02 +02:00 |
|
ptibogxiv
|
f80e19c126
|
Fix var $amount
|
2019-08-27 17:46:05 +02:00 |
|
ptibogxiv
|
9ac1add425
|
FIX amount or stripe account with currency
|
2019-08-27 12:46:28 +02:00 |
|
Laurent Destailleur
|
290766acaa
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-26 23:57:15 +02:00 |
|
Laurent Destailleur
|
513f224349
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-08-26 23:56:43 +02:00 |
|
Laurent Destailleur
|
c7f06fe50e
|
Fix phpcs
|
2019-08-26 23:56:17 +02:00 |
|
Laurent Destailleur
|
999db7ed41
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
|
2019-08-26 16:49:25 +02:00 |
|
Laurent Destailleur
|
7c5fc9f3f8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-08-26 16:43:33 +02:00 |
|
Laurent Destailleur
|
c93e6550ce
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-08-26 16:43:24 +02:00 |
|
Laurent Destailleur
|
dcfbba9af5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-08-26 16:41:06 +02:00 |
|
Laurent Destailleur
|
11dbe80a7b
|
Merge pull request #11740 from ptibogxiv/patch-240
Fix context display with takepos societe/list.php
|
2019-08-26 16:37:57 +02:00 |
|
Laurent Destailleur
|
7ebd79a45f
|
Update list.php
|
2019-08-26 16:02:24 +02:00 |
|
ptibogxiv
|
dbcead47e1
|
Update list.php
|
2019-08-24 16:05:21 +02:00 |
|
ptibogxiv
|
7b5c9818f7
|
Fix context display with takepos societe/list.php
|
2019-08-24 15:58:33 +02:00 |
|
ptibogxiv
|
0afc55ab51
|
Update paymentmodes.php
|
2019-08-23 09:08:39 +02:00 |
|
ptibogxiv
|
55d70004b1
|
Update paymentmodes.php
|
2019-08-23 09:00:11 +02:00 |
|
ptibogxiv
|
4536b8618e
|
Update paymentmodes.php
|
2019-08-22 22:48:37 +02:00 |
|
ptibogxiv
|
cef4bdab7b
|
NEW update / delete stripe account for supplier
|
2019-08-22 22:20:50 +02:00 |
|
ptibogxiv
|
f70180b51b
|
FIx number of col for IBAN list
|
2019-08-21 22:23:58 +02:00 |
|
ptibogxiv
|
5613532b80
|
Fix context in takepos
need downgrade in v10 of this PR fo fix hiden context https://github.com/Dolibarr/dolibarr/pull/11629
|
2019-08-21 13:30:31 +02:00 |
|
Laurent Destailleur
|
7d51a65401
|
Merge pull request #11629 from andreubisquerra/master
Add contextpage hidden input to preserve contexpage in customer search form
|
2019-08-16 17:50:52 +02:00 |
|
Laurent Destailleur
|
b8406f842d
|
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
Fix total on list and amount opened on thirdparty card (for supplier)
|
2019-08-15 21:14:03 +02:00 |
|
Laurent Destailleur
|
317c5576d1
|
Merge branch 'develop' into patch-214
|
2019-08-15 19:38:05 +02:00 |
|
ptibogxiv
|
32d1c787fc
|
Update paymentmodes.php
|
2019-08-10 09:37:03 +02:00 |
|
Laurent Destailleur
|
8647a20c18
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
|
2019-08-10 01:57:43 +02:00 |
|
Laurent Destailleur
|
d245ca371e
|
Update societe.class.php
|
2019-08-09 23:45:06 +02:00 |
|
Frédéric FRANCE
|
372eddf0c6
|
Update societe.class.php
|
2019-08-07 13:49:14 +02:00 |
|
ptibogxiv
|
d0f6d1f175
|
Update paymentmodes.php
|
2019-08-06 13:12:10 +02:00 |
|
ptibogxiv
|
944943dcc0
|
Update paymentmodes.php
|
2019-08-06 13:10:40 +02:00 |
|
ptibogxiv
|
2585f7232a
|
Update paymentmodes.php
|
2019-08-06 13:09:56 +02:00 |
|
ptibogxiv
|
0fafeab764
|
Update paymentmodes.php
|
2019-08-06 13:08:34 +02:00 |
|
ptibogxiv
|
de5872db6d
|
Update paymentmodes.php
|
2019-08-06 00:12:49 +02:00 |
|
ptibogxiv
|
bb5dd734a9
|
Balance Stripe connect account for supplier
|
2019-08-05 23:34:28 +02:00 |
|
andreubisquerra
|
607a0e5da4
|
Add contextpage hidden input to preserve contexpage in search form
|
2019-08-04 10:50:46 +02:00 |
|
ptibogxiv
|
4ed1ff5b9b
|
Fix display only stripe sources for customer
|
2019-08-03 21:17:12 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Laurent Destailleur
|
dca775985f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:41 +02:00 |
|
Laurent Destailleur
|
34f78c555d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:35 +02:00 |
|
Laurent Destailleur
|
a7a2e483c9
|
Update paymentmodes.php
|
2019-07-30 16:01:26 +02:00 |
|
Laurent Destailleur
|
db69a07bc4
|
FIX Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
|
2019-07-30 15:21:26 +02:00 |
|
Maxime Kohlhaas
|
3cc2c91e31
|
Use date_rum if defined
|
2019-07-28 22:26:19 +02:00 |
|
Maxime Kohlhaas
|
be6ad7b6a4
|
New : can define RUM date on third bank account
|
2019-07-28 17:10:37 +02:00 |
|
Laurent Destailleur
|
bf55733678
|
NEW Replace the "info" tab on contract with the more complete "agenda"
tag.
|
2019-07-23 02:45:31 +02:00 |
|
Laurent Destailleur
|
6fa4a99a1b
|
Merge pull request #11533 from OPEN-DSI/new-api-contacts-deletecategories
FIX Delete a category to a contact in API
|
2019-07-22 18:30:34 +02:00 |
|
Alexandre SPANGARO
|
2c74caff90
|
WIP
|
2019-07-22 06:56:55 +02:00 |
|
Laurent Destailleur
|
d6d1b29257
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-21 16:15:32 +02:00 |
|
Laurent Destailleur
|
904e399293
|
Fix wrong nb of parmaeters
|
2019-07-20 16:25:57 +02:00 |
|
Laurent Destailleur
|
6015254a77
|
Fix var not defined
|
2019-07-20 16:15:01 +02:00 |
|
Laurent Destailleur
|
b6a1c92fc0
|
Enhance phpstan
|
2019-07-20 16:08:31 +02:00 |
|
Laurent Destailleur
|
f368ef377b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/societe/class/societe.class.php
|
2019-07-20 16:02:15 +02:00 |
|
Laurent Destailleur
|
6bc38acb56
|
Fix assignation
|
2019-07-20 16:01:28 +02:00 |
|
Laurent Destailleur
|
73b5302905
|
Fix var not defined
|
2019-07-20 16:00:16 +02:00 |
|
Laurent Destailleur
|
6594b361b1
|
Removed useless code
|
2019-07-20 15:56:20 +02:00 |
|
Laurent Destailleur
|
fea12c3c59
|
Fix class not found error
|
2019-07-20 15:55:22 +02:00 |
|
Laurent Destailleur
|
2e68488231
|
Enhance scan using phpstan
|
2019-07-20 15:53:46 +02:00 |
|
Laurent Destailleur
|
a900055631
|
Fix class not found error
|
2019-07-20 15:53:21 +02:00 |
|
Laurent Destailleur
|
6956067d8f
|
Fix print of print
|
2019-07-20 15:04:11 +02:00 |
|
VESSILLER
|
b95395909c
|
FIX Delete a category to a contact in API
|
2019-07-19 16:11:44 +02:00 |
|
Laurent Destailleur
|
cd1a2d24ee
|
Removed not used file
|
2019-07-19 13:07:07 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
John Botella
|
70ff806fdf
|
fix fourn code preload
|
2019-07-16 10:46:58 +02:00 |
|
Laurent Destailleur
|
f826e9631c
|
FIX #11463
|
2019-07-16 00:12:22 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
2a05164bb1
|
FIX Better PHP compatibility
|
2019-07-14 00:31:28 +02:00 |
|
VESSILLER
|
266ed86194
|
NEW Add a category to a contact in API
|
2019-07-08 12:37:24 +02:00 |
|
Laurent Destailleur
|
2fee41f712
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-04 12:27:00 +02:00 |
|
ptibogxiv
|
03938e2123
|
Update paymentmodes.php
|
2019-07-02 21:56:50 +02:00 |
|
ptibogxiv
|
126479b5a9
|
Fix paymentmethod detach
|
2019-07-02 21:46:00 +02:00 |
|
Laurent Destailleur
|
0725ce0e3f
|
Update consumption.php
|
2019-06-28 12:37:44 +02:00 |
|
ptibogxiv
|
b2ec60d53b
|
Fix qty to negative if refund
|
2019-06-26 14:08:51 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
1daac232b0
|
Code comment
|
2019-06-24 14:31:58 +02:00 |
|
Laurent Destailleur
|
e12fde398a
|
Fix phpcs
|
2019-06-23 19:50:55 +02:00 |
|
Laurent Destailleur
|
efa09301b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 20:19:14 +02:00 |
|
Laurent Destailleur
|
b202c7eaa0
|
Fix confusion between ->childs and ->childsoncascade
|
2019-06-22 20:17:40 +02:00 |
|
Laurent Destailleur
|
eb20df8e64
|
Fix debug save of state into setup
|
2019-06-22 14:47:46 +02:00 |
|
Laurent Destailleur
|
6cab4f03ba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 12:10:50 +02:00 |
|
Laurent Destailleur
|
ed34d4ccbd
|
Bad trans
|
2019-06-22 12:10:30 +02:00 |
|
Laurent Destailleur
|
9e7b08e378
|
Trans missing
|
2019-06-22 12:05:17 +02:00 |
|
Laurent Destailleur
|
4721dc3d34
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 11:57:39 +02:00 |
|
Laurent Destailleur
|
403d41ec30
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 11:55:33 +02:00 |
|
Laurent Destailleur
|
9644b9c669
|
Merge pull request #10932 from tony13tv/patch-6
[CHANGE] Make State available in .odt templates...
|
2019-06-22 11:26:32 +02:00 |
|
Laurent Destailleur
|
0bc0f8ae94
|
Fix translation of country
|
2019-06-21 15:40:35 +02:00 |
|
Laurent Destailleur
|
e60020140d
|
Update societe.class.php
|
2019-06-20 04:11:10 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Laurent Destailleur
|
898d766489
|
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
Allow zero as account number
|
2019-06-20 03:09:37 +02:00 |
|
Nicolas ZABOURI
|
2e4db8c83c
|
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
|
2019-06-19 08:39:05 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Eric Seigne
|
0b3bc5a172
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber
|
2019-06-17 18:30:11 +02:00 |
|
Eric Seigne
|
80d4d8754d
|
allow zero as accountancy code nomber (replace all empty tests by != '')
|
2019-06-17 18:28:11 +02:00 |
|
Laurent Destailleur
|
bde49e05e7
|
Fix doc
|
2019-06-17 18:23:38 +02:00 |
|
Laurent Destailleur
|
8330078de1
|
Fix default value
|
2019-06-17 12:33:09 +02:00 |
|
Laurent Destailleur
|
efb9a30ec1
|
Fix compatibility with payment modes
|
2019-06-16 17:17:07 +02:00 |
|
Laurent Destailleur
|
48b2cb83af
|
Close #11152 by a manual merge to keep only required things
|
2019-06-16 17:08:23 +02:00 |
|
Laurent Destailleur
|
bc8c7e0d4f
|
Code comment
|
2019-06-14 15:03:37 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|